Swiftdiff options
Diffstat (limited to 'QA/Swiften')
| -rw-r--r-- | QA/Swiften/ClientTest/.gitignore | 1 | ||||
| -rw-r--r-- | QA/Swiften/ClientTest/SConscript | 32 | ||||
| -rw-r--r-- | QA/Swiften/NetworkTest/SConscript | 26 | ||||
| -rw-r--r-- | QA/Swiften/SConscript | 14 |
4 files changed, 34 insertions, 39 deletions
diff --git a/QA/Swiften/ClientTest/.gitignore b/QA/Swiften/ClientTest/.gitignore new file mode 100644 index 0000000..9fb3e67 --- /dev/null +++ b/QA/Swiften/ClientTest/.gitignore @@ -0,0 +1 @@ +ClientTest diff --git a/QA/Swiften/ClientTest/SConscript b/QA/Swiften/ClientTest/SConscript index 164de57..a9d9a19 100644 --- a/QA/Swiften/ClientTest/SConscript +++ b/QA/Swiften/ClientTest/SConscript @@ -2,21 +2,21 @@ import os Import("env") -myenv = env.Clone() -myenv.MergeFlags(env["SWIFTEN_FLAGS"]) -myenv.MergeFlags(env["CPPUNIT_FLAGS"]) -myenv.MergeFlags(env["LIBIDN_FLAGS"]) -myenv.MergeFlags(env["BOOST_FLAGS"]) -myenv.MergeFlags(env["SQLITE_FLAGS"]) -myenv.MergeFlags(env["ZLIB_FLAGS"]) -myenv.MergeFlags(env["OPENSSL_FLAGS"]) -myenv.MergeFlags(env.get("LIBXML_FLAGS", "")) -myenv.MergeFlags(env.get("EXPAT_FLAGS", "")) +if env["TEST"] : + myenv = env.Clone() + myenv.MergeFlags(env["SWIFTEN_FLAGS"]) + myenv.MergeFlags(env["CPPUNIT_FLAGS"]) + myenv.MergeFlags(env["LIBIDN_FLAGS"]) + myenv.MergeFlags(env["BOOST_FLAGS"]) + myenv.MergeFlags(env["SQLITE_FLAGS"]) + myenv.MergeFlags(env["ZLIB_FLAGS"]) + myenv.MergeFlags(env["OPENSSL_FLAGS"]) + myenv.MergeFlags(env.get("LIBXML_FLAGS", "")) + myenv.MergeFlags(env.get("EXPAT_FLAGS", "")) -for i in ["SWIFT_CLIENTTEST_JID", "SWIFT_CLIENTTEST_PASS"]: - if os.environ.get(i, "") : - myenv["ENV"][i] = os.environ[i] + for i in ["SWIFT_CLIENTTEST_JID", "SWIFT_CLIENTTEST_PASS"]: + if os.environ.get(i, "") : + myenv["ENV"][i] = os.environ[i] -tester = myenv.Program("ClientTest", ["ClientTest.cpp"]) -clientTest = myenv.Alias("ClientTest", tester, env.get("TEST_RUNNER", "") + tester[0].abspath) -env.AlwaysBuild(clientTest) + tester = myenv.Program("ClientTest", ["ClientTest.cpp"]) + myenv.Test(tester, "system") diff --git a/QA/Swiften/NetworkTest/SConscript b/QA/Swiften/NetworkTest/SConscript index fa5122b..cf66a68 100644 --- a/QA/Swiften/NetworkTest/SConscript +++ b/QA/Swiften/NetworkTest/SConscript @@ -2,17 +2,17 @@ import os Import("env") -myenv = env.Clone() -myenv.MergeFlags(env["CHECKER_FLAGS"]) -myenv.MergeFlags(env["SWIFTEN_FLAGS"]) -myenv.MergeFlags(env["CPPUNIT_FLAGS"]) -myenv.MergeFlags(env["BOOST_FLAGS"]) -myenv.MergeFlags(env["LIBIDN_FLAGS"]) +if env["TEST"] : + myenv = env.Clone() + myenv.MergeFlags(env["CHECKER_FLAGS"]) + myenv.MergeFlags(env["SWIFTEN_FLAGS"]) + myenv.MergeFlags(env["CPPUNIT_FLAGS"]) + myenv.MergeFlags(env["BOOST_FLAGS"]) + myenv.MergeFlags(env["LIBIDN_FLAGS"]) -tester = myenv.Program("NetworkTest", [ - "BoostConnectionServerTest.cpp", - "BoostConnectionTest.cpp", - "DomainNameResolverTest.cpp", - ]) -clientTest = myenv.Alias("NetworkTest", tester, env.get("TEST_RUNNER", "") + tester[0].abspath) -env.AlwaysBuild(clientTest) + tester = myenv.Program("NetworkTest", [ + "BoostConnectionServerTest.cpp", + "BoostConnectionTest.cpp", + "DomainNameResolverTest.cpp", + ]) + myenv.Test(tester, "system") diff --git a/QA/Swiften/SConscript b/QA/Swiften/SConscript index 6ee7365..ede7b39 100644 --- a/QA/Swiften/SConscript +++ b/QA/Swiften/SConscript @@ -1,10 +1,4 @@ -Import("env") - -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", tests) +SConscript([ + "NetworkTest/SConscript", + "ClientTest/SConscript", + ]) |