summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2010-03-28 18:39:28 (GMT)
committerRemko Tronçon <git@el-tramo.be>2010-03-28 18:39:28 (GMT)
commit7548dabae7d10e48816142e508be651ada9f7bc3 (patch)
tree112b7b80be56905b0e65550ec6afd541f12d3fc8 /QA/UnitTest
parentb9468847a2a77ed5d7909a6c0cc9bf2e53a7252f (diff)
downloadswift-contrib-7548dabae7d10e48816142e508be651ada9f7bc3.zip
swift-contrib-7548dabae7d10e48816142e508be651ada9f7bc3.tar.bz2
Fixed unit test compilation when Swift is not present.
Diffstat (limited to 'QA/UnitTest')
-rw-r--r--QA/UnitTest/SConscript18
1 files changed, 9 insertions, 9 deletions
diff --git a/QA/UnitTest/SConscript b/QA/UnitTest/SConscript
index dc4dbfc..cd9cdc8 100644
--- a/QA/UnitTest/SConscript
+++ b/QA/UnitTest/SConscript
@@ -7,18 +7,18 @@ if env["TEST"] :
env["UNITTEST_SOURCES"] = []
if env["SCONS_STAGE"] == "test" :
myenv = env.Clone()
- myenv.MergeFlags(env["CHECKER_FLAGS"])
- myenv.MergeFlags(env["SLIMBER_FLAGS"])
- myenv.MergeFlags(env["SWIFT_CONTROLLERS_FLAGS"])
- myenv.MergeFlags(env["SWIFTOOLS_FLAGS"])
- myenv.MergeFlags(env["SWIFTEN_FLAGS"])
- myenv.MergeFlags(env["CPPUNIT_FLAGS"])
- myenv.MergeFlags(env["LIBIDN_FLAGS"])
- myenv.MergeFlags(env["BOOST_FLAGS"])
+ myenv.MergeFlags(env.get("CHECKER_FLAGS",""))
+ myenv.MergeFlags(env.get("SLIMBER_FLAGS",""))
+ myenv.MergeFlags(env.get("SWIFT_CONTROLLERS_FLAGS",""))
+ myenv.MergeFlags(env.get("SWIFTOOLS_FLAGS",""))
+ myenv.MergeFlags(env.get("SWIFTEN_FLAGS",""))
+ myenv.MergeFlags(env.get("CPPUNIT_FLAGS",""))
+ myenv.MergeFlags(env.get("LIBIDN_FLAGS", ""))
+ myenv.MergeFlags(env.get("BOOST_FLAGS", ""))
myenv.MergeFlags(env.get("SQLITE_FLAGS", ""))
myenv.MergeFlags(env.get("LIBXML_FLAGS", ""))
myenv.MergeFlags(env.get("EXPAT_FLAGS", ""))
- myenv.MergeFlags(env["ZLIB_FLAGS"])
+ myenv.MergeFlags(env.get("ZLIB_FLAGS", ""))
if env.get("HAVE_LIBXML") :
myenv.Append(CPPDEFINES = ["HAVE_LIBXML"])
if env.get("HAVE_EXPAT") :