changeset be4990a2c764 in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=be4990a2c764
description:
Regression: Update the regress script after SE/FS merge
This patch updates the regress script to reflect the merge of the
SE/FS builds and the new structure of the test directories. It adds a
"mode" flag to the script, that defaults to both se and fs.
diffstat:
util/regress | 51 +++++++++++++++++++++++++--------------------------
1 files changed, 25 insertions(+), 26 deletions(-)
diffs (79 lines):
diff -r 00f0d0230596 -r be4990a2c764 util/regress
--- a/util/regress Wed Feb 01 09:48:28 2012 -0800
+++ b/util/regress Thu Feb 02 04:51:13 2012 -0500
@@ -40,17 +40,19 @@
add_option('-v', '--verbose', action='store_true', default=False,
help='echo commands before executing')
add_option('--builds',
- default='ALPHA_SE,ALPHA_SE_MOESI_hammer,' \
- 'ALPHA_SE_MESI_CMP_directory,' \
- 'ALPHA_SE_MOESI_CMP_directory,' \
- 'ALPHA_SE_MOESI_CMP_token,' \
- 'ALPHA_FS,' \
- 'MIPS_SE,' \
- 'POWER_SE,' \
- 'SPARC_SE,SPARC_FS,' \
- 'X86_SE,X86_FS,' \
- 'ARM_SE,ARM_FS',
+ default='ALPHA,ALPHA_MOESI_hammer,' \
+ 'ALPHA_MESI_CMP_directory,' \
+ 'ALPHA_MOESI_CMP_directory,' \
+ 'ALPHA_MOESI_CMP_token,' \
+ 'MIPS,' \
+ 'POWER,' \
+ 'SPARC,' \
+ 'X86,' \
+ 'ARM',
help="comma-separated build targets to test (default: '%default')")
+add_option('--modes',
+ default='se,fs',
+ help="comma-separated modes to test (default: '%default')")
add_option('--test-variants', default='opt',
help="comma-separated build variants to test (default: '%default')"\
", set to '' for none")
@@ -82,6 +84,7 @@
# split list options on ',' to get Python lists
builds = split_if_nonempty(options.builds)
+modes = split_if_nonempty(options.modes)
test_variants = split_if_nonempty(options.test_variants)
compile_variants = split_if_nonempty(options.compile_variants)
@@ -112,25 +115,21 @@
for variant in compile_variants
for build in builds]
-# By default run the 'quick' tests
+# By default run the 'quick' tests, all expands to quick and long
if not tests:
tests = ['quick']
+elif 'all' in tests:
+ tests = ['quick,long']
-# set up test targets for scons
-if 'all' in tests:
- targets += ['%s/%s/tests/%s' % (options.build_dir, build, variant)
- for build in builds
- for variant in test_variants]
-else:
- # Ugly! Since we don't have any quick SPARC_FS tests remove the
- # SPARC_FS target If we ever get a quick SPARC_FS test, this code
- # should be removed
- if 'quick' in tests and 'SPARC_FS' in builds:
- builds.remove('SPARC_FS')
- targets += ['%s/%s/tests/%s/%s' % (options.build_dir, build, variant, test)
- for build in builds
- for variant in test_variants
- for test in tests]
+# set up test targets for scons, since we don't have any quick SPARC
+# full-system tests exclude it
+targets += ['%s/%s/tests/%s/%s/%s' % (options.build_dir, build, variant, test,
+ mode)
+ for build in builds
+ for variant in test_variants
+ for test in tests
+ for mode in modes
+ if not (build == 'SPARC' and test == 'quick' and mode == 'fs')]
def cpu_count():
if 'bsd' in sys.platform or sys.platform == 'darwin':
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
