Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2011-04-17 10:42:55 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2011-04-18 19:11:46 (GMT) |
| commit | eadf2fa562b8017b505151a171a8f8ca7796cab6 (patch) | |
| tree | 60f29125661103b0e77f648ca559b06255267a08 | |
| parent | 60925bd2f77df3be75ad46118a940a096499f18b (diff) | |
| download | swift-eadf2fa562b8017b505151a171a8f8ca7796cab6.zip swift-eadf2fa562b8017b505151a171a8f8ca7796cab6.tar.bz2 | |
Added option to build library with tests.
| -rw-r--r-- | BuildTools/SCons/SConstruct | 1 | ||||
| -rw-r--r-- | QA/UnitTest/SConscript | 13 |
2 files changed, 9 insertions, 5 deletions
diff --git a/BuildTools/SCons/SConstruct b/BuildTools/SCons/SConstruct index 246092d..0ee1d0e 100644 --- a/BuildTools/SCons/SConstruct +++ b/BuildTools/SCons/SConstruct @@ -212,6 +212,7 @@ env["TEST"] = (env["TEST_TYPE"] != "none") or env.GetOption("clean") if env.get("valgrind", 0) : env["TEST_RUNNER"] = "valgrind --suppressions=QA/valgrind.supp -q --leak-check=full --track-origins=yes " env["TEST_IGNORE_RESULT"] = "ignore_test_result" in ARGUMENTS +env["TEST_CREATE_LIBRARIES"] = "create_test_libraries" in ARGUMENTS # Packaging env["DIST"] = "dist" in ARGUMENTS or env.GetOption("clean") diff --git a/QA/UnitTest/SConscript b/QA/UnitTest/SConscript index 25e9b05..3876919 100644 --- a/QA/UnitTest/SConscript +++ b/QA/UnitTest/SConscript @@ -26,8 +26,11 @@ if env["TEST"] : myenv.Append(CPPDEFINES = ["HAVE_LIBXML"]) if env.get("HAVE_EXPAT") : myenv.Append(CPPDEFINES = ["HAVE_EXPAT"]) - checker = myenv.Program("checker", env["UNITTEST_SOURCES"] + env["UNITTEST_OBJECTS"]) - for i in ["HOME", "USERPROFILE", "APPDATA"]: - if os.environ.get(i, "") : - myenv["ENV"][i] = os.environ[i] - myenv.Test(checker, is_checker = True) + if env["TEST_CREATE_LIBRARIES"] : + myenv.StaticLibrary("Swift_UnitTests", env["UNITTEST_SOURCES"] + env["UNITTEST_OBJECTS"]) + else : + checker = myenv.Program("checker", env["UNITTEST_SOURCES"] + env["UNITTEST_OBJECTS"]) + for i in ["HOME", "USERPROFILE", "APPDATA"]: + if os.environ.get(i, "") : + myenv["ENV"][i] = os.environ[i] + myenv.Test(checker, is_checker = True) |