From 23cb4d0f7ce3f9a195af41c909cd8b145b10e854 Mon Sep 17 00:00:00 2001 From: "Meredith L. Patterson" Date: Wed, 20 Nov 2013 20:24:21 -0600 Subject: [PATCH] test runner/test dir ready to go; scons builds/executes php tests in src/bindings/php/Tests --- src/bindings/php/SConscript | 7 ++++--- src/bindings/php/{TestHammer.php => Tests/TokenTest.php} | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) rename src/bindings/php/{TestHammer.php => Tests/TokenTest.php} (90%) diff --git a/src/bindings/php/SConscript b/src/bindings/php/SConscript index b2194d6..16cfe15 100644 --- a/src/bindings/php/SConscript +++ b/src/bindings/php/SConscript @@ -1,5 +1,5 @@ # -*- python -*- -import os.path +import os, os.path Import('env libhammer_shared') phpenv = env.Clone(IMPLICIT_COMMAND_DEPENDENCIES = 0) @@ -18,6 +18,7 @@ libhammer_php = phpenv.SharedLibrary('hammer', swig) phptestenv = phpenv.Clone() phptestenv['ENV']['LD_LIBRARY_PATH'] = os.path.dirname(str(libhammer_shared[0])) -phptestenv.Command(None, ['TestHammer.php', libhammer_php], "phpunit $SOURCE") +tests = phptestenv.Dir('Tests/') +phptestenv.Command(tests, [libhammer_php], "phpunit -v --include-path "+os.getcwd()+" $TARGET") -Clean('.', ['hammer.php', 'TestHammer.php']) +Clean('.', ['hammer.php']) diff --git a/src/bindings/php/TestHammer.php b/src/bindings/php/Tests/TokenTest.php similarity index 90% rename from src/bindings/php/TestHammer.php rename to src/bindings/php/Tests/TokenTest.php index b71eb9f..6a9cad5 100644 --- a/src/bindings/php/TestHammer.php +++ b/src/bindings/php/Tests/TokenTest.php @@ -1,8 +1,8 @@