From: Gabe Black Date: Wed, 18 Oct 2017 23:48:17 +0000 (-0700) Subject: scons: Fix the regression tests. X-Git-Tag: v19.0.0.0~2596 X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=6f6de1888c07bff418d3f80a07872677b8699a33;p=gem5.git scons: Fix the regression tests. A recent scons cleanup introduced a small bug when setting the variant path of the regression test SConscript. When turned into a relative path, the directory can be interpreted differently depending on what it's considered relative to. When left as a scons node, there is no ambiguity. Change-Id: I162afdc4fcef81db096ec8304f81bc98fa6bf899 Reviewed-on: https://gem5-review.googlesource.com/5221 Reviewed-by: Jason Lowe-Power Maintainer: Gabe Black --- diff --git a/src/SConscript b/src/SConscript index 911e5a37c..76bf8d1b4 100755 --- a/src/SConscript +++ b/src/SConscript @@ -1117,7 +1117,7 @@ def makeEnv(env, label, objsfx, strip=False, disable_partial=False, **kwargs): # Set up regression tests. SConscript(os.path.join(env.root.abspath, 'tests', 'SConscript'), - variant_dir=Dir('tests').Dir(new_env.Label).path, + variant_dir=Dir('tests').Dir(new_env.Label), exports={ 'env' : new_env }, duplicate=False) # Start out with the compiler flags common to all compilers,