summaryrefslogtreecommitdiff
path: root/tests/SConscript
diff options
context:
space:
mode:
authorBrad Beckmann <Brad.Beckmann@amd.com>2010-01-29 20:29:40 -0800
committerBrad Beckmann <Brad.Beckmann@amd.com>2010-01-29 20:29:40 -0800
commitab2f864af2fd38cbf141708550409f3ca72c675f (patch)
tree75b861a290240275d872a58d393a6d6f7e5598d5 /tests/SConscript
parentceae8383ffeebdc2c12d9a383941c62653471de1 (diff)
downloadgem5-ab2f864af2fd38cbf141708550409f3ca72c675f.tar.xz
m5: Regression Tester Update
This patch includes the necessary regression updates to test the new ruby configuration system. The patch includes support for multiple ruby protocols and adds the ruby random tester. The patch removes atomic mode test for ruby since ruby does not support atomic mode acceses. These tests can be added back in when ruby supports atomic mode for real. --HG-- rename : tests/quick/50.memtest/test.py => tests/quick/60.rubytest/test.py
Diffstat (limited to 'tests/SConscript')
-rw-r--r--tests/SConscript18
1 files changed, 15 insertions, 3 deletions
diff --git a/tests/SConscript b/tests/SConscript
index 8e219b30e..5d7348917 100644
--- a/tests/SConscript
+++ b/tests/SConscript
@@ -264,11 +264,23 @@ if env['FULL_SYSTEM']:
else:
configs += ['simple-atomic', 'simple-timing', 'o3-timing', 'memtest',
'simple-atomic-mp', 'simple-timing-mp', 'o3-timing-mp',
- 'inorder-timing']
+ 'inorder-timing', 'rubytest']
if env['RUBY']:
- # Hack for Ruby
- configs += [c + '-ruby' for c in configs]
+ # With Ruby, A protocol must be specified in the environment
+ assert(env['PROTOCOL'])
+
+ #
+ # Is there a way to determine what is Protocol EnumVariable
+ # default and eliminate the need to hard code the default protocol below?
+ #
+ # If the binary includes the default ruby protocol, run both ruby and
+ # non-ruby versions of the tests. Otherwise just run the ruby versions.
+ #
+ if env['PROTOCOL'] == 'MI_example':
+ configs += [c + "-ruby" for c in configs]
+ else:
+ configs = [c + "-ruby-" + env['PROTOCOL'] for c in configs]
cwd = os.getcwd()
os.chdir(str(Dir('.').srcdir))