Gabe Black has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/28179 )
Change subject: util: Make running m5 util unit tests opt-in.
......................................................................
util: Make running m5 util unit tests opt-in.
These tests don't run reliably right now for a few reasons, including
problems with QEMU, and apparently inaccurate information from g++-s
--print-sysroot option.
This may be revisited in the future if those problems can be sorted out.
For now, avoid tripping up new people who won't know to (or how to) work
around those sorts of errors.
Change-Id: Ide42e6c6b27159ff146b8495ae568d1fd377f4f4
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/28179
Reviewed-by: Gabe Black <[email protected]>
Maintainer: Gabe Black <[email protected]>
Tested-by: kokoro <[email protected]>
---
M util/m5/README.md
M util/m5/SConstruct
2 files changed, 4 insertions(+), 5 deletions(-)
Approvals:
Gabe Black: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/util/m5/README.md b/util/m5/README.md
index 6913478..941c499 100644
--- a/util/m5/README.md
+++ b/util/m5/README.md
@@ -175,7 +175,7 @@
### SCons command line flags
--debug-build: Compile with the -g option, and -O0.
---no-test-xml: Exclude the test result XML files from the build.
+--run-tests: Allow the test result XML files to be build targets.
--verbose: Show build command lines and full command output.
## External dependency detection
diff --git a/util/m5/SConstruct b/util/m5/SConstruct
index 79fb1fa..6f1ca9f 100644
--- a/util/m5/SConstruct
+++ b/util/m5/SConstruct
@@ -44,8 +44,8 @@
AddOption('--debug-build', dest='debug_build', action='store_true',
help='Build with debug info, and disable optimizations.')
-AddOption('--no-test-xml', dest='no_tests', action='store_true',
- help='Omit test output xml files from the build.')
+AddOption('--run-tests', dest='run_tests', action='store_true',
+ help='Enable test output xml files as build targets.')
AddOption('--verbose', dest='verbose', action='store_true')
# Universal settings.
@@ -118,8 +118,7 @@
need_qemu_to_run = 'HAVE_QEMU' in env;
# If we can run this test...
- if (not need_qemu_to_run or env['HAVE_QEMU']) \
- and not GetOption('no_tests'):
+ if GetOption('run_tests') and (not need_qemu_to_run or
env['HAVE_QEMU']):
# An XML file which holds the results of the test.
xml = Dir('test').Dir('result').File('%s.xml' % name)
# The basic command line for the test.
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/28179
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: Ide42e6c6b27159ff146b8495ae568d1fd377f4f4
Gerrit-Change-Number: 28179
Gerrit-PatchSet: 30
Gerrit-Owner: Gabe Black <[email protected]>
Gerrit-Reviewer: Bobby R. Bruce <[email protected]>
Gerrit-Reviewer: Earl Ou <[email protected]>
Gerrit-Reviewer: Gabe Black <[email protected]>
Gerrit-Reviewer: Giacomo Travaglini <[email protected]>
Gerrit-Reviewer: Jason Lowe-Power <[email protected]>
Gerrit-Reviewer: Yu-hsin Wang <[email protected]>
Gerrit-Reviewer: kokoro <[email protected]>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list -- [email protected]
To unsubscribe send an email to [email protected]
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
