Use variable in unit tests

git-svn-id: https://svn.berlios.de/svnroot/repos/senf/trunk@1603 270642c3-0616-0410-b53a-bc976706d245

diff --git a/SConstruct b/SConstruct
index f781e5c..a0e520f 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -154,25 +154,25 @@ Export('env')
 ###########################################################################
 # Configure
 
-# Default configuration (boost stuff)
-senfutil.Configure(env)
-
 @senfconf.Test
 def CheckValgrind(context):
     context.Message( "Checking for valgrind... " )
-    ret = context.TryAction(['valgrind --version >$TARGET'])
+    ret = context.TryAction(['$VALGRIND --version >$TARGET'])
     context.Result( ret[1].strip() or False )
     return ret[0]
 
 @senfconf.Test
 def CheckValgrindWildcards(context):
     context.Message( "Checking whether valgrind supports '...' wildcards in suppressions... " )
-    ret = context.TryAction(['valgrind --suppressions=$SOURCE /bin/true'],
+    ret = context.TryAction(['$VALGRIND --suppressions=$SOURCE /bin/true'],
                             "{\n test_suppression\n Memcheck:Addr4\n ...\n fun:foo\n}\n",
                             ".sup")
     context.Result( ret[0] )
     return ret[0]
 
+# Default configuration (boost stuff)
+senfutil.Configure(env)
+
 conf = env.Configure(clean=False, help=False, custom_tests = senfconf.Tests())
 env.Replace(
     HAVE_VALGRIND  = conf.CheckValgrind() and conf.CheckValgrindWildcards()