Skip to content

Commit 9b70729

Browse files
committed
Merge pull request #211 from bridadan/fix-test-list
Fix test listing
2 parents 9bbc532 + 9e012bb commit 9b70729

File tree

1 file changed

+6
-9
lines changed

1 file changed

+6
-9
lines changed

tools/test.py

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@
112112
if options.list:
113113
# Print available tests in order and exit
114114
print_tests(tests, options.format)
115+
sys.exit(0)
115116
else:
116117
# Build all tests
117118
if not options.build_dir:
@@ -146,7 +147,6 @@
146147
except Exception, e:
147148
library_build_success = False
148149
print "Failed to build library"
149-
print e
150150

151151
if library_build_success:
152152
# Build all the tests
@@ -158,9 +158,6 @@
158158
macros=options.macros,
159159
verbose=options.verbose,
160160
jobs=options.jobs)
161-
162-
if not test_build_success:
163-
print "Failed to build some tests, check build log for details"
164161

165162
# If a path to a test spec is provided, write it to a file
166163
if options.test_spec:
@@ -181,13 +178,13 @@
181178

182179
# If a path to a JUnit build report spec is provided, write it to a file
183180
if options.build_report_junit:
184-
report_exporter = ReportExporter(ResultExporterType.JUNIT)
181+
report_exporter = ReportExporter(ResultExporterType.JUNIT, package="build")
185182
report_exporter.report_to_file(build_report, options.build_report_junit, test_suite_properties=build_properties)
186183

187-
if library_build_success and test_build_success:
188-
sys.exit(0)
189-
else:
190-
sys.exit(1)
184+
if library_build_success and test_build_success:
185+
sys.exit(0)
186+
else:
187+
sys.exit(1)
191188

192189
except KeyboardInterrupt, e:
193190
print "\n[CTRL+c] exit"

0 commit comments

Comments
 (0)