Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2009-10-31 13:22:07 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2009-11-01 11:19:59 (GMT) |
| commit | b353fac98e08d8f225781b95e55b80aa67171262 (patch) | |
| tree | 6c16fb1af8c98ecfefe48eae4cbcce6dd600d975 /QA/Swiften/ClientTest | |
| parent | 27751e9b1a176e1169e1aa1cfc16180c559e061f (diff) | |
| download | swift-contrib-b353fac98e08d8f225781b95e55b80aa67171262.zip swift-contrib-b353fac98e08d8f225781b95e55b80aa67171262.tar.bz2 | |
Added SCons test framework.
Diffstat (limited to 'QA/Swiften/ClientTest')
| -rw-r--r-- | QA/Swiften/ClientTest/.gitignore | 1 | ||||
| -rw-r--r-- | QA/Swiften/ClientTest/SConscript | 32 |
2 files changed, 17 insertions, 16 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") |