From: Serge Rehbinder Date: Fri, 5 Aug 2016 14:24:15 +0000 (+0200) Subject: 'sat jobs': All columns of input file in the resulting board X-Git-Tag: 5.0.0a1~157 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=3c1c5dcad98da4acea722edd5698cba492478c5e;hp=78cadadada66b6e6c2e5a5c2dc9f307fff33f2ab;p=tools%2Fsat.git 'sat jobs': All columns of input file in the resulting board --- diff --git a/commands/jobs.py b/commands/jobs.py index 0999cf3..892e651 100644 --- 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 842423d..1ecbfaf 100644 --- 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 d3b4df0..6577c5e 100644 --- a/src/xsl/jobs_board_report.xsl +++ b/src/xsl/jobs_board_report.xsl @@ -79,7 +79,7 @@ - +