3c3
< # Copyright (c) 2004-2005 The Regents of The University of Michigan
---
> # Copyright (c) 2004-2006 The Regents of The University of Michigan
27a28,30
> #
> # Authors: Steve Reinhardt
> # Kevin Lim
139c142,143
< def test_builder(env, category, cpu_list=[], os_list=[], refdir='ref', timeout=15):
---
> def test_builder(env, category, cpu_list=[], os_list=[], refdir='ref',
> timeout=15):
155a160,167
> if env['TEST_CPU_MODELS']:
> temp_cpu_list = []
> for i in env['TEST_CPU_MODELS']:
> if i in cpu_list:
> temp_cpu_list.append(i)
> cpu_list = temp_cpu_list
> # Code commented out that shows the general structure if we want to test
> # different OS's as well.
157c169,170
< # raise RuntimeError, "No OS specified"
---
> # for test_cpu in cpu_list:
> # build_cpu_test(env, category, '', test_cpu, refdir, timeout)
160,161c173,176
< # build_cpu_test(env, category, test_os, cpu_list, refdir, timeout)
< # Loop through CPU models and generate proper options, ref directories for each
---
> # for test_cpu in cpu_list:
> # build_cpu_test(env, category, test_os, test_cpu, refdir,
> # timeout)
> # Loop through CPU models and generate proper options, ref directories
174c189,190
< # Reference stats located in ref/arch/os/cpu or ref/arch/cpu if no OS specified
---
> # Reference stats located in ref/arch/os/cpu or ref/arch/cpu
> # if no OS specified
205,206c221,222
< env.Command([stdout_string, stderr_string, m5stats_string], [env.M5Binary, 'run.py'],
< ' '.join(cmd))
---
> env.Command([stdout_string, stderr_string, m5stats_string],
> [env.M5Binary, 'run.py'], ' '.join(cmd))
215c231,232
< p = env.Command(cpu_option[1] + '_update', [ref_stats, m5stats_string, status_string],
---
> p = env.Command(cpu_option[1] + '_update',
> [ref_stats, m5stats_string, status_string],
218c235,236
< p = env.Command(cpu_option[1] + '_print', [status_string], printAction)
---
> p = env.Command(cpu_option[1] + '_print', [status_string],
> printAction)