summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2009-08-12 17:59:10 (GMT)
committerRemko Tronçon <git@el-tramo.be>2009-08-12 17:59:10 (GMT)
commit283a6801fd11aeaf38b2298399c2bf622f743cf4 (patch)
treea63e3401309793844c29b08512d7a9dc12636fb3 /Swiften
parent2a28c1be20477ddf25a233ee34c991951295058b (diff)
downloadswift-283a6801fd11aeaf38b2298399c2bf622f743cf4.zip
swift-283a6801fd11aeaf38b2298399c2bf622f743cf4.tar.bz2
Added Slimber & valgrind testing to SCons.
Diffstat (limited to 'Swiften')
-rw-r--r--Swiften/QA/ClientTest/SConscript2
-rw-r--r--Swiften/QA/NetworkTest/.gitignore1
-rw-r--r--Swiften/QA/NetworkTest/SConscript2
-rw-r--r--Swiften/QA/SConscript5
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)