'sat jobs': All columns of input file in the resulting board

diff --git a/commands/jobs.py b/commands/jobs.py
index 0999cf367f7298dbe36ac5d113912394d60702e0..892e6512ced46895018a8db3660e77f18f378195 100644 (file)
--- a/commands/jobs.py
+++ b/commands/jobs.py
@@ -1241,7 +1241,6 @@ class Gui(object):
             columns = input_board[0][1:]
             
             rows = []
-            columns_out = []
             jobs = []
             for line in input_board[1:]:
                 row = line[0]
@@ -1253,13 +1252,11 @@ class Gui(object):
                     if today in days:
                         if row not in rows:
                             rows.append(row)
-                        if columns[i] not in columns_out:
-                            columns_out.append(columns[i])
                         job = (row, columns[i])
                         jobs.append(job)
 
             d_boards[board_name] = {"rows" : rows,
-                                    "columns" : columns_out,
+                                    "columns" : columns,
                                     "jobs" : jobs}
         
         self.d_input_boards = d_boards

diff --git a/src/compilation.py b/src/compilation.py
index 842423d482d98db68d709c2096daabc9a7d7347b..1ecbfaf52d533bbb3a7e1fcff07fe4add8a38d7f 100644 (file)
--- a/src/compilation.py
+++ b/src/compilation.py
@@ -291,9 +291,9 @@ CC=\\"hack_libtool\\"%g" libtool'''
         if src.architecture.is_windows():
             command = 'msbuild RUN_TESTS.vcxproj'
         else :
-            if self.use_autotools :
+            if self.product_info.build_source=="autotools" :
                 command = 'make check'
-            else :
+            else:
                 command = 'make test'
             
         self.log_command(command)

diff --git a/src/xsl/jobs_board_report.xsl b/src/xsl/jobs_board_report.xsl
index d3b4df08a931d4e1fdfb2b88876de29374456d61..6577c5ef7a9aa3e6f16e11036875fa0657d041f9 100644 (file)
--- a/src/xsl/jobs_board_report.xsl
+++ b/src/xsl/jobs_board_report.xsl
@@ -79,7 +79,7 @@
 </style>
 
 <xsl:if test="//JobsReport/infos/@JobsCommandStatus='running'">
-  <meta http-equiv="refresh" content="1"></meta>
+  <meta http-equiv="refresh" content="10"></meta>
 </xsl:if>
 
 <script language="JavaScript"><![CDATA[

diff --git a/src/xsl/jobs_global_report.xsl b/src/xsl/jobs_global_report.xsl
index 614483aa8d8245357cbea989f860b64e6726cf58..dfe647f0d15c3d81de079494b2ad61abe1445634 100644 (file)
--- a/src/xsl/jobs_global_report.xsl
+++ b/src/xsl/jobs_global_report.xsl
@@ -79,7 +79,7 @@
 </style>
 
 <xsl:if test="//JobsReport/infos/@JobsCommandStatus='running'">
-  <meta http-equiv="refresh" content="1"></meta>
+  <meta http-equiv="refresh" content="10"></meta>
 </xsl:if>
 
 <script language="JavaScript"><![CDATA[