From 68fdccb30bd85cd99823fb411ec7ae67112062d7 Mon Sep 17 00:00:00 2001 From: Andreas Hansson Date: Thu, 13 Oct 2016 03:17:19 -0400 Subject: ruby: Fix regressions and make Ruby configs Python packages This patch moves the addition of network options into the Ruby module to avoid the regressions all having to add it explicitly. Doing this exposes an issue in our current config system though, namely the fact that addtoPath is relative to the Python script being executed. Since both example and regression scripts use the Ruby module we would end up with two different (relative) paths being added. Instead we take a first step at turning the config modules into Python packages, simply by adding a __init__.py in the configs/ruby, configs/topologies and configs/network subdirectories. As a result, we can now add the top-level configs directory to the Python search path, and then use the package names in the various modules. The example scripts are also updated, and the messy path-deducing variations in the scripts are unified. --- tests/configs/simple-atomic-mp-ruby.py | 2 -- 1 file changed, 2 deletions(-) (limited to 'tests/configs/simple-atomic-mp-ruby.py') 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) ] -- cgit v1.2.3