summaryrefslogtreecommitdiff
path: root/SConstruct
diff options
context:
space:
mode:
authorKevin Lim <ktlim@umich.edu>2006-07-22 15:50:39 -0400
committerKevin Lim <ktlim@umich.edu>2006-07-22 15:50:39 -0400
commit7ccdb7accc073d282e9df804da400394a795b2ae (patch)
treed935413c25fa0e0684bcfdc8dcda4052a10a853d /SConstruct
parentdb5f710a7b9fbaf6cc63861d9cd7dc3f4a3fdea1 (diff)
downloadgem5-7ccdb7accc073d282e9df804da400394a795b2ae.tar.xz
Last minute check in. Very few functional changes other than some minor config updates. Also include some recently generated stats.
SConstruct: Make test CPUs option non-sticky. configs/common/FSConfig.py: Be sure to set the memory mode. configs/test/fs.py: Wrong string. tests/SConscript: Only test valid CPUs that have been compiled in. tests/test1/ref/alpha/atomic/config.ini: tests/test1/ref/alpha/atomic/config.out: tests/test1/ref/alpha/atomic/m5stats.txt: tests/test1/ref/alpha/atomic/stdout: tests/test1/ref/alpha/detailed/config.ini: tests/test1/ref/alpha/detailed/config.out: tests/test1/ref/alpha/detailed/m5stats.txt: tests/test1/ref/alpha/detailed/stdout: tests/test1/ref/alpha/timing/config.ini: tests/test1/ref/alpha/timing/config.out: tests/test1/ref/alpha/timing/m5stats.txt: tests/test1/ref/alpha/timing/stdout: Update output. --HG-- extra : convert_revision : 6eee2a5eae0291b5121b41bcd7021179cdd520a3
Diffstat (limited to 'SConstruct')
-rw-r--r--SConstruct4
1 files changed, 2 insertions, 2 deletions
diff --git a/SConstruct b/SConstruct
index ce80068f3..fd912fc03 100644
--- a/SConstruct
+++ b/SConstruct
@@ -279,8 +279,6 @@ sticky_opts.AddOptions(
# scons 0.96.90 or later.
ListOption('CPU_MODELS', 'CPU models', 'AtomicSimpleCPU,TimingSimpleCPU',
env['ALL_CPU_LIST']),
- ListOption('TEST_CPU_MODELS', 'CPU models to test if regression is being run', '',
- env['ALL_CPU_LIST']),
BoolOption('ALPHA_TLASER',
'Model Alpha TurboLaser platform (vs. Tsunami)', False),
BoolOption('NO_FAST_ALLOC', 'Disable fast object allocator', False),
@@ -304,6 +302,8 @@ sticky_opts.AddOptions(
# Non-sticky options only apply to the current build.
nonsticky_opts = Options(args=ARGUMENTS)
nonsticky_opts.AddOptions(
+ ListOption('TEST_CPU_MODELS', 'CPU models to test if regression is being run', '',
+ env['ALL_CPU_LIST']),
BoolOption('update_ref', 'Update test reference outputs', False)
)