From 0bd0cfc5496e25a0376d96c68da2b5fcbecf3e1f Mon Sep 17 00:00:00 2001
From: Ichthyostega <prg@ichthyostega.de>
Date: Fri, 26 Dec 2008 23:31:00 +0100
Subject: [PATCH] SCons: allow setting VALGRINDFLAGS from the environment

---
 tests/SConscript | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/tests/SConscript b/tests/SConscript
index 761f911b3..a6a4457cd 100644
--- a/tests/SConscript
+++ b/tests/SConscript
@@ -92,9 +92,14 @@ artifacts['testsuite'] = ts = ( [ testExecutable(env, dir) for dir in ['lib','co
 #    is explicitly propagated to test.sh
 #
 testEnv = env.Clone()
-if not env['VALGRIND']:
-    testEnv.Append(ENV = { 'VALGRINDFLAGS' : 'DISABLE'
-                         , 'LUMIERA_CONFIG_PATH' : './' })
+
+valgrind = os.environ.get('VALGRINDFLAGS', '') # unset if not defined
+if not valgrind and not env['VALGRIND']:
+    valgrind = 'DISABLE'
+
+testEnv.Append(ENV = { 'VALGRINDFLAGS' : valgrind
+                     , 'LUMIERA_CONFIG_PATH' : './' 
+                     })
     
 testsuites = env['TESTSUITES'] or os.environ.get('TESTSUITES')
 if testsuites: