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

1 files changed, 10 insertions, 4 deletions

diff --git a/tests/SConscript b/tests/SConscript
index 8e4d1da01..7ccb77759 100644
--- a/tests/SConscript
+++ b/tests/SConscript
@@ -155,14 +155,20 @@ def test_builder(env, category, cpu_list=[], os_list=[], refdir='ref',
     default_refdir = False
     if refdir == 'ref':
         default_refdir = True
+    valid_cpu_list = []
     if len(cpu_list) == 0:
-        cpu_list = env['CPU_MODELS']
+        valid_cpu_list = env['CPU_MODELS']
+    else:
+        for i in cpu_list:
+            if i in env['CPU_MODELS']:
+                valid_cpu_list.append(i)
+    cpu_list = valid_cpu_list
     if env['TEST_CPU_MODELS']:
-        temp_cpu_list = []
+        valid_cpu_list = []
         for i in env['TEST_CPU_MODELS']:
             if i in cpu_list:
-                temp_cpu_list.append(i)
-        cpu_list = temp_cpu_list
+                valid_cpu_list.append(i)
+        cpu_list = valid_cpu_list
 # Code commented out that shows the general structure if we want to test
 # different OS's as well.
 #    if len(os_list) == 0: