From 315c7a28c6303de69f3fa17e282e59df08c9f94c Mon Sep 17 00:00:00 2001 From: "Meredith L. Patterson" <mlp@thesmartpolitenerd.com> Date: Sat, 23 Nov 2013 16:11:36 -0600 Subject: [PATCH] cleaned out some cruft; php tests run on successive builds w/o needing to clean. --- src/bindings/php/SConscript | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/bindings/php/SConscript b/src/bindings/php/SConscript index aa9a5357..30391c26 100644 --- a/src/bindings/php/SConscript +++ b/src/bindings/php/SConscript @@ -20,12 +20,12 @@ phptestenv['ENV']['LD_LIBRARY_PATH'] = os.path.dirname(str(libhammer_shared[0])) phptests = ('Tests') phpextprefix = os.popen("php-config --extension-dir").read().rstrip() phplib = phptestenv.Command(os.path.join(phpextprefix, "hammer.so"), libhammer_php, Copy("$TARGET", "$SOURCE")) +AlwaysBuild(phplib) phpprefix = os.popen("php-config --prefix").read().rstrip() phpincl = phptestenv.Command(os.path.join(phpprefix, "hammer.ini"), "hammer.ini", Copy("$TARGET", "$SOURCE")) phptestexec = phptestenv.Command(phptests, [phplib, phpincl], "phpenv exec phpunit -v --include-path " + os.path.dirname(libhammer_php[0].path) +" src/bindings/php/Tests") -print "phptestexec path: " + phptestexec[0].path phptest = Alias("testphp", [phptestexec], phptestexec) AlwaysBuild(phptest) testruns.append(phptest) -print "Testing: " + str([str(x[0]) for x in testruns]) + -- GitLab