10 files changed, 25 insertions, 58 deletions
diff --git a/tests/configs/gpu-randomtest-ruby.py b/tests/configs/gpu-randomtest-ruby.py
index 92810fd64..0bc386973 100644
--- a/tests/configs/gpu-randomtest-ruby.py
+++ b/tests/configs/gpu-randomtest-ruby.py
@@ -39,15 +39,10 @@ from m5.defines import buildEnv
 from m5.util import addToPath
 import os, optparse, sys
 
-# Get paths we might need.  It's expected this file is in m5/configs/example.
-config_path = os.path.dirname(os.path.abspath(__file__))
-config_root = os.path.dirname(config_path)
-m5_root = os.path.dirname(config_root)
-addToPath(config_root+'/configs/common')
-addToPath(config_root+'/configs/ruby')
-addToPath(config_root+'/configs/topologies')
-
-import Ruby
+m5.util.addToPath('../configs/common')
+m5.util.addToPath('../configs/')
+
+from ruby import Ruby
 import Options
 
 parser = optparse.OptionParser()
diff --git a/tests/configs/gpu-ruby.py b/tests/configs/gpu-ruby.py
index d007ebffc..b01914780 100644
--- a/tests/configs/gpu-ruby.py
+++ b/tests/configs/gpu-ruby.py
@@ -39,14 +39,10 @@ from m5.defines import buildEnv
 from m5.util import addToPath
 import os, optparse, sys, math, glob
 
-# Get paths we might need
-config_path = os.path.dirname(os.path.abspath(__file__))
-config_root = os.path.dirname(config_path)
-addToPath(config_root+'/configs/common')
-addToPath(config_root+'/configs/ruby')
-addToPath(config_root+'/configs/topologies')
-
-import Ruby
+m5.util.addToPath('../configs/common')
+m5.util.addToPath('../configs/')
+
+from ruby import Ruby
 import Options
 import GPUTLBOptions, GPUTLBConfig
 
diff --git a/tests/configs/memtest-ruby.py b/tests/configs/memtest-ruby.py
index 221d28b2e..1fac02a14 100644
--- a/tests/configs/memtest-ruby.py
+++ b/tests/configs/memtest-ruby.py
@@ -33,15 +33,10 @@ from m5.defines import buildEnv
 from m5.util import addToPath
 import os, optparse, sys
 
-# Get paths we might need
-config_path = os.path.dirname(os.path.abspath(__file__))
-config_root = os.path.dirname(config_path)
-m5_root = os.path.dirname(config_root)
-addToPath(config_root+'/configs/common')
-addToPath(config_root+'/configs/ruby')
-addToPath(config_root+'/configs/topologies')
-
-import Ruby
+m5.util.addToPath('../configs/common')
+m5.util.addToPath('../configs/')
+
+from ruby import Ruby
 import Options
 
 parser = optparse.OptionParser()
diff --git a/tests/configs/o3-timing-mp-ruby.py b/tests/configs/o3-timing-mp-ruby.py
index fb2d56fd1..74b207b3e 100644
--- a/tests/configs/o3-timing-mp-ruby.py
+++ b/tests/configs/o3-timing-mp-ruby.py
@@ -29,7 +29,6 @@
 import m5
 from m5.objects import *
 m5.util.addToPath('../configs/common')
-m5.util.addToPath('../configs/topologies')
 
 nb_cores = 4
 cpus = [ DerivO3CPU(cpu_id=i) for i in xrange(nb_cores) ]
diff --git a/tests/configs/o3-timing-ruby.py b/tests/configs/o3-timing-ruby.py
index c47d9f355..787ae0bad 100644
--- a/tests/configs/o3-timing-ruby.py
+++ b/tests/configs/o3-timing-ruby.py
@@ -29,7 +29,6 @@
 import m5
 from m5.objects import *
 m5.util.addToPath('../configs/common')
-m5.util.addToPath('../configs/topologies')
 
 
 import ruby_config
diff --git a/tests/configs/pc-simple-timing-ruby.py b/tests/configs/pc-simple-timing-ruby.py
index 006aeb6a4..32964a875 100644
--- a/tests/configs/pc-simple-timing-ruby.py
+++ b/tests/configs/pc-simple-timing-ruby.py
@@ -32,9 +32,8 @@ m5.util.addToPath('../configs/common')
 from Benchmarks import SysConfig
 import FSConfig
 
-m5.util.addToPath('../configs/ruby')
-m5.util.addToPath('../configs/topologies')
-import Ruby
+m5.util.addToPath('../configs/')
+from ruby import Ruby
 import Options
 
 # Add the ruby specific and protocol specific options
diff --git a/tests/configs/rubytest-ruby.py b/tests/configs/rubytest-ruby.py
index 77c7b51a8..6e64785da 100644
--- a/tests/configs/rubytest-ruby.py
+++ b/tests/configs/rubytest-ruby.py
@@ -34,15 +34,10 @@ from m5.defines import buildEnv
 from m5.util import addToPath
 import os, optparse, sys
 
-# Get paths we might need.  It's expected this file is in m5/configs/example.
-config_path = os.path.dirname(os.path.abspath(__file__))
-config_root = os.path.dirname(config_path)
-m5_root = os.path.dirname(config_root)
-addToPath(config_root+'/configs/common')
-addToPath(config_root+'/configs/ruby')
-addToPath(config_root+'/configs/topologies')
-
-import Ruby
+m5.util.addToPath('../configs/common')
+m5.util.addToPath('../configs/')
+
+from ruby import Ruby
 import Options
 
 parser = optparse.OptionParser()
diff --git a/tests/configs/simple-atomic-mp-ruby.py b/tests/configs/simple-atomic-mp-ruby.py
index bdda6d005..e43590741 100644
--- a/tests/configs/simple-atomic-mp-ruby.py
+++ b/tests/configs/simple-atomic-mp-ruby.py
@@ -28,8 +28,6 @@
 
 import m5
 from m5.objects import *
-m5.util.addToPath('../configs/topologies')
-
 
 nb_cores = 4
 cpus = [ AtomicSimpleCPU(cpu_id=i) for i in xrange(nb_cores) ]
diff --git a/tests/configs/simple-timing-mp-ruby.py b/tests/configs/simple-timing-mp-ruby.py
index 263b330fb..c7dd6cd87 100644
--- a/tests/configs/simple-timing-mp-ruby.py
+++ b/tests/configs/simple-timing-mp-ruby.py
@@ -32,16 +32,11 @@ from m5.defines import buildEnv
 from m5.util import addToPath
 import os, optparse, sys
 
-# Get paths we might need
-config_path = os.path.dirname(os.path.abspath(__file__))
-config_root = os.path.dirname(config_path)
-m5_root = os.path.dirname(config_root)
-addToPath(config_root+'/configs/common')
-addToPath(config_root+'/configs/ruby')
-addToPath(config_root+'/configs/topologies')
+m5.util.addToPath('../configs/common')
+m5.util.addToPath('../configs/')
 
 import Options
-import Ruby
+from ruby import Ruby
 
 parser = optparse.OptionParser()
 Options.addCommonOptions(parser)
diff --git a/tests/configs/simple-timing-ruby.py b/tests/configs/simple-timing-ruby.py
index b9fb650e5..2d2a9e4df 100644
--- a/tests/configs/simple-timing-ruby.py
+++ b/tests/configs/simple-timing-ruby.py
@@ -32,14 +32,10 @@ from m5.defines import buildEnv
 from m5.util import addToPath
 import os, optparse, sys
 
-# Get paths we might need
-config_path = os.path.dirname(os.path.abspath(__file__))
-config_root = os.path.dirname(config_path)
-addToPath(config_root+'/configs/common')
-addToPath(config_root+'/configs/ruby')
-addToPath(config_root+'/configs/topologies')
-
-import Ruby
+m5.util.addToPath('../configs/common')
+m5.util.addToPath('../configs/')
+
+from ruby import Ruby
 import Options
 
 parser = optparse.OptionParser()