Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2012-06-04 17:15:34 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2012-06-05 07:32:01 (GMT) |
| commit | e43999d275ff27970ba973edd2be68fb6b998aaf (patch) | |
| tree | b3442e40a221b19f60535028e04712396dabe7ed /QA/UnitTest | |
| parent | 1514e787b28ee09ea28d75828bf41049696fd5c7 (diff) | |
| download | swift-e43999d275ff27970ba973edd2be68fb6b998aaf.zip swift-e43999d275ff27970ba973edd2be68fb6b998aaf.tar.bz2 | |
Added ICU support.
Diffstat (limited to 'QA/UnitTest')
| -rw-r--r-- | QA/UnitTest/SConscript | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/QA/UnitTest/SConscript b/QA/UnitTest/SConscript index 3a19ea5..10301b9 100644 --- a/QA/UnitTest/SConscript +++ b/QA/UnitTest/SConscript @@ -15,14 +15,7 @@ if env["TEST"] : myenv.UseFlags(env.get("LIMBER_FLAGS","")) myenv.UseFlags(env.get("SWIFTEN_FLAGS","")) myenv.UseFlags(env.get("CPPUNIT_FLAGS","")) - myenv.UseFlags(env.get("LIBIDN_FLAGS", "")) - myenv.UseFlags(env.get("BOOST_FLAGS", "")) - myenv.UseFlags(env.get("SQLITE_FLAGS", "")) - myenv.UseFlags(env.get("LIBXML_FLAGS", "")) - myenv.UseFlags(env.get("EXPAT_FLAGS", "")) - myenv.UseFlags(env.get("ZLIB_FLAGS", "")) - myenv.UseFlags(env.get("OPENSSL_FLAGS", "")) - myenv.UseFlags(env["PLATFORM_FLAGS"]) + myenv.UseFlags(env.get("SWIFTEN_DEP_FLAGS", "")) if env.get("HAVE_LIBXML") : myenv.Append(CPPDEFINES = ["HAVE_LIBXML"]) if env.get("HAVE_EXPAT") : @@ -35,4 +28,6 @@ if env["TEST"] : for i in ["HOME", "USERPROFILE", "APPDATA"]: if os.environ.get(i, "") : myenv["ENV"][i] = os.environ[i] + if myenv["PLATFORM"] == "darwin" : + myenv["ENV"]["DYLD_LIBRARY_PATH"] = ":".join(map(lambda x : str(x), myenv.get("LIBPATH", []))) myenv.Test(checker, is_checker = True) |