43,52c43,51
< 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',
53a53,55
> add_option('--modes',
> default='se,fs',
> help="comma-separated modes to test (default: '%default')")
84a87
> modes = split_if_nonempty(options.modes)
115c118
< # By default run the 'quick' tests
---
> # By default run the 'quick' tests, all expands to quick and long
117a121,122
> elif 'all' in tests:
> tests = ['quick,long']
119,133c124,132
< # 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')]