ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Renamed Jenkins specific options to general "Build" options

pull/1040/head
Brian Daniels 2015-04-14 13:45:56 -05:00
parent 5eb4894e71
commit 2f4d668382
4 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.travis.yml
View File

@ -6,3 +6,4 @@ install:
- "sudo $TRAVIS_BUILD_DIR/travis/install_dependencies.sh > /dev/null" - "sudo $TRAVIS_BUILD_DIR/travis/install_dependencies.sh > /dev/null"
- sudo pip install colorama - sudo pip install colorama
- sudo pip install prettytable - sudo pip install prettytable
- sudo pip install jinja2

6
workspace_tools/build_release.py
View File

@ -101,7 +101,7 @@ if __name__ == '__main__':
default=False, help="Verbose diagnostic output") default=False, help="Verbose diagnostic output")
parser.add_option("-t", "--toolchains", dest="toolchains", help="Use toolchains names separated by comma") parser.add_option("-t", "--toolchains", dest="toolchains", help="Use toolchains names separated by comma")
parser.add_option("", "--report-jenkins", dest="report_jenkins_file_name", help="Output the build results to an xml file that is readable by Jenkins") parser.add_option("", "--report-build", dest="report_build_file_name", help="Output the build results to an html file")
options, args = parser.parse_args() options, args = parser.parse_args()
@ -147,8 +147,8 @@ if __name__ == '__main__':
# Write summary of the builds # Write summary of the builds
if options.report_jenkins_file_name: if options.report_build_file_name:
write_build_report(build_report, 'library_build/report.html', options.report_jenkins_file_name) write_build_report(build_report, 'library_build/report.html', options.report_build_file_name)
print "\n\nCompleted in: (%.2f)s" % (time() - start) print "\n\nCompleted in: (%.2f)s" % (time() - start)

2
workspace_tools/singletest.py
View File

@ -209,7 +209,7 @@ if __name__ == '__main__':
_opts_log_file_name=opts.log_file_name, _opts_log_file_name=opts.log_file_name,
_opts_report_html_file_name=opts.report_html_file_name, _opts_report_html_file_name=opts.report_html_file_name,
_opts_report_junit_file_name=opts.report_junit_file_name, _opts_report_junit_file_name=opts.report_junit_file_name,
_opts_report_jenkins_file_name=opts.report_jenkins_file_name, _opts_report_build_file_name=opts.report_build_file_name,
_test_spec=test_spec, _test_spec=test_spec,
_opts_goanna_for_mbed_sdk=opts.goanna_for_mbed_sdk, _opts_goanna_for_mbed_sdk=opts.goanna_for_mbed_sdk,
_opts_goanna_for_tests=opts.goanna_for_tests, _opts_goanna_for_tests=opts.goanna_for_tests,

16
workspace_tools/test_api.py
View File

@ -154,7 +154,7 @@ class SingleTestRunner(object):
_opts_log_file_name=None, _opts_log_file_name=None,
_opts_report_html_file_name=None, _opts_report_html_file_name=None,
_opts_report_junit_file_name=None, _opts_report_junit_file_name=None,
_opts_report_jenkins_file_name=None, _opts_report_build_file_name=None,
_test_spec={}, _test_spec={},
_opts_goanna_for_mbed_sdk=None, _opts_goanna_for_mbed_sdk=None,
_opts_goanna_for_tests=None, _opts_goanna_for_tests=None,
@ -207,7 +207,7 @@ class SingleTestRunner(object):
self.opts_log_file_name = _opts_log_file_name self.opts_log_file_name = _opts_log_file_name
self.opts_report_html_file_name = _opts_report_html_file_name self.opts_report_html_file_name = _opts_report_html_file_name
self.opts_report_junit_file_name = _opts_report_junit_file_name self.opts_report_junit_file_name = _opts_report_junit_file_name
self.opts_report_jenkins_file_name = _opts_report_jenkins_file_name self.opts_report_build_file_name = _opts_report_build_file_name
self.opts_goanna_for_mbed_sdk = _opts_goanna_for_mbed_sdk self.opts_goanna_for_mbed_sdk = _opts_goanna_for_mbed_sdk
self.opts_goanna_for_tests = _opts_goanna_for_tests self.opts_goanna_for_tests = _opts_goanna_for_tests
self.opts_shuffle_test_order = _opts_shuffle_test_order self.opts_shuffle_test_order = _opts_shuffle_test_order
@ -1438,9 +1438,9 @@ def singletest_in_cli_mode(single_test):
# Export results in form of JUnit XML report to separate file # Export results in form of JUnit XML report to separate file
report_exporter = ReportExporter(ResultExporterType.JUNIT) report_exporter = ReportExporter(ResultExporterType.JUNIT)
report_exporter.report_to_file(test_summary_ext, single_test.opts_report_junit_file_name, test_suite_properties=test_suite_properties_ext) report_exporter.report_to_file(test_summary_ext, single_test.opts_report_junit_file_name, test_suite_properties=test_suite_properties_ext)
if single_test.opts_report_jenkins_file_name: if single_test.opts_report_build_file_name:
# Export build results as Jenkins XML report ti sparate file # Export build results as html report to sparate file
write_build_report(build_report, 'tests_build/report.html', single_test.opts_report_jenkins_file_name) write_build_report(build_report, 'tests_build/report.html', single_test.opts_report_build_file_name)
class TestLogger(): class TestLogger():
@ -1811,9 +1811,9 @@ def get_default_test_options_parser():
dest='report_junit_file_name', dest='report_junit_file_name',
help='You can log test suite results in form of JUnit compliant XML report') help='You can log test suite results in form of JUnit compliant XML report')
parser.add_option("", "--report-jenkins", parser.add_option("", "--report-build",
dest="report_jenkins_file_name", dest="report_build_file_name",
help="Output the build results to an xml file that is readable by Jenkins") help="Output the build results to an html file")
parser.add_option('', '--verbose-skipped', parser.add_option('', '--verbose-skipped',
dest='verbose_skipped_tests', dest='verbose_skipped_tests',