summaryrefslogtreecommitdiff
path: root/src/SConscript
diff options
context:
space:
mode:
authorGabe Black <gabeblack@google.com>2017-10-18 16:48:17 -0700
committerGabe Black <gabeblack@google.com>2017-10-19 00:41:14 +0000
commit6f6de1888c07bff418d3f80a07872677b8699a33 (patch)
treeb264b2e97362bbff710856f40c6a9be9ad64d8ff /src/SConscript
parentb8efd0e854ae568dae33fe3d24f67054ed016d19 (diff)
downloadgem5-6f6de1888c07bff418d3f80a07872677b8699a33.tar.xz
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 <jason@lowepower.com> Maintainer: Gabe Black <gabeblack@google.com>
Diffstat (limited to 'src/SConscript')
-rwxr-xr-xsrc/SConscript2
1 files changed, 1 insertions, 1 deletions
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,