Swiftdiff options
Diffstat (limited to 'Swiften')
| -rw-r--r-- | Swiften/QA/ClientTest/SConscript | 2 | ||||
| -rw-r--r-- | Swiften/QA/NetworkTest/.gitignore | 1 | ||||
| -rw-r--r-- | Swiften/QA/NetworkTest/SConscript | 2 | ||||
| -rw-r--r-- | Swiften/QA/SConscript | 5 |
4 files changed, 6 insertions, 4 deletions
diff --git a/Swiften/QA/ClientTest/SConscript b/Swiften/QA/ClientTest/SConscript index 6da8705..cd48169 100644 --- a/Swiften/QA/ClientTest/SConscript +++ b/Swiften/QA/ClientTest/SConscript @@ -17,5 +17,5 @@ for i in ["SWIFT_CLIENTTEST_JID", "SWIFT_CLIENTTEST_PASS"]: myenv["ENV"][i] = os.environ[i] tester = myenv.Program("ClientTest", ["ClientTest.cpp"]) -clientTest = myenv.Alias("ClientTest", tester, tester[0].abspath) +clientTest = myenv.Alias("ClientTest", tester, env.get("TEST_RUNNER", "") + tester[0].abspath) env.AlwaysBuild(clientTest) diff --git a/Swiften/QA/NetworkTest/.gitignore b/Swiften/QA/NetworkTest/.gitignore new file mode 100644 index 0000000..5a3caca --- /dev/null +++ b/Swiften/QA/NetworkTest/.gitignore @@ -0,0 +1 @@ +NetworkTest diff --git a/Swiften/QA/NetworkTest/SConscript b/Swiften/QA/NetworkTest/SConscript index f12c28d..606c02e 100644 --- a/Swiften/QA/NetworkTest/SConscript +++ b/Swiften/QA/NetworkTest/SConscript @@ -14,5 +14,5 @@ tester = myenv.Program("NetworkTest", [ "DomainNameResolverTest.cpp", "#/QA/UnitTest/checker.cpp" ]) -clientTest = myenv.Alias("NetworkTest", tester, tester[0].abspath) +clientTest = myenv.Alias("NetworkTest", tester, env.get("TEST_RUNNER", "") + tester[0].abspath) env.AlwaysBuild(clientTest) diff --git a/Swiften/QA/SConscript b/Swiften/QA/SConscript index 89d8285..6ee7365 100644 --- a/Swiften/QA/SConscript +++ b/Swiften/QA/SConscript @@ -1,9 +1,10 @@ Import("env") -if "test" in COMMAND_LINE_TARGETS or env.GetOption("clean") : +tests = ["NetworkTest", "ClientTest"] +if "test" in COMMAND_LINE_TARGETS or env.GetOption("clean") or len(set(tests) & set(COMMAND_LINE_TARGETS)): SConscript([ "NetworkTest/SConscript", "ClientTest/SConscript", ]) - test = env.Alias("test", ["NetworkTest", "ClientTest"]) + test = env.Alias("test", tests) |