Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2016-04-25 19:43:29 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2016-04-25 19:43:29 (GMT) |
| commit | 857791adda753a0f94da8317bbc019378b1f09bd (patch) | |
| tree | 96aa2e4d863d50888a16527f9fbb38712e97d8ee /QA | |
| parent | b58ad7f4b01623a8807b8c268208bd9c8496f4e2 (diff) | |
| download | swift-857791adda753a0f94da8317bbc019378b1f09bd.zip swift-857791adda753a0f94da8317bbc019378b1f09bd.tar.bz2 | |
Convert hard tabs to four spaces in all our SConscript/*.py files
Test-Information:
Test that it still builds and unit test pass on OS X 10.11.4.
Change-Id: I2eb4a0b707991aee553db36a8cd1ae28b813acab
Diffstat (limited to 'QA')
| -rw-r--r-- | QA/Checker/SConscript | 26 | ||||
| -rw-r--r-- | QA/SConscript | 6 | ||||
| -rw-r--r-- | QA/UnitTest/SConscript | 48 |
3 files changed, 40 insertions, 40 deletions
diff --git a/QA/Checker/SConscript b/QA/Checker/SConscript index 13dec62..06ec01b 100644 --- a/QA/Checker/SConscript +++ b/QA/Checker/SConscript @@ -1,17 +1,17 @@ Import("env") if env["TEST"] : - if env["SCONS_STAGE"] == "flags" : - env["CHECKER_FLAGS"] = { - "CPPPATH" : ["#/3rdParty/HippoMocks"], - "LIBS": ["Checker"], - "LIBPATH": [Dir(".")], - "LINKFLAGS": env["PLATFORM"] == "win32" and ["/SUBSYSTEM:CONSOLE"] or [] - } + if env["SCONS_STAGE"] == "flags" : + env["CHECKER_FLAGS"] = { + "CPPPATH" : ["#/3rdParty/HippoMocks"], + "LIBS": ["Checker"], + "LIBPATH": [Dir(".")], + "LINKFLAGS": env["PLATFORM"] == "win32" and ["/SUBSYSTEM:CONSOLE"] or [] + } - if env["SCONS_STAGE"] == "build" : - checker_env = env.Clone() - checker_env.UseFlags(env["SWIFTEN_FLAGS"]) - checker_env.UseFlags(env["BOOST_FLAGS"]) - checker_env.UseFlags(env["CPPUNIT_FLAGS"]) - checker_env.Library("Checker", ["checker.cpp", "IO.cpp"]) + if env["SCONS_STAGE"] == "build" : + checker_env = env.Clone() + checker_env.UseFlags(env["SWIFTEN_FLAGS"]) + checker_env.UseFlags(env["BOOST_FLAGS"]) + checker_env.UseFlags(env["CPPUNIT_FLAGS"]) + checker_env.Library("Checker", ["checker.cpp", "IO.cpp"]) diff --git a/QA/SConscript b/QA/SConscript index 5c626e3..b4125cf 100644 --- a/QA/SConscript +++ b/QA/SConscript @@ -1,4 +1,4 @@ SConscript(dirs = [ - "Checker", - "UnitTest" - ]) + "Checker", + "UnitTest" + ]) diff --git a/QA/UnitTest/SConscript b/QA/UnitTest/SConscript index 0cacc7c..1874f99 100644 --- a/QA/UnitTest/SConscript +++ b/QA/UnitTest/SConscript @@ -3,27 +3,27 @@ import os Import("env") if env["TEST"] : - if env["SCONS_STAGE"] == "flags" : - env["UNITTEST_SOURCES"] = [] - env["UNITTEST_OBJECTS"] = [] - if env["SCONS_STAGE"] == "build" : - myenv = env.Clone() - myenv.UseFlags(env.get("CHECKER_FLAGS","")) - myenv.UseFlags(env.get("INJECTED_UNITTEST_FLAGS","")) # So things that piggy-back our build system can piggy-back our test system too - myenv.UseFlags(env.get("SLIMBER_FLAGS","")) - myenv.UseFlags(env.get("SWIFT_CONTROLLERS_FLAGS","")) - myenv.UseFlags(env.get("SWIFTOOLS_FLAGS","")) - myenv.UseFlags(env.get("LIMBER_FLAGS","")) - myenv.UseFlags(env.get("SWIFTEN_FLAGS","")) - myenv.UseFlags(env.get("CPPUNIT_FLAGS","")) - myenv.UseFlags(env.get("SWIFTEN_DEP_FLAGS", "")) - if env.get("HAVE_LIBXML") : - myenv.Append(CPPDEFINES = ["HAVE_LIBXML"]) - if env.get("HAVE_EXPAT") : - myenv.Append(CPPDEFINES = ["HAVE_EXPAT"]) - if env["TEST_CREATE_LIBRARIES"] : - lib = myenv.StaticLibrary("Swift_UnitTests", env["UNITTEST_SOURCES"] + env["UNITTEST_OBJECTS"]) - myenv.Program("checker", lib) - else : - checker = myenv.Program("checker", env["UNITTEST_SOURCES"] + env["UNITTEST_OBJECTS"]) - myenv.Test(checker, is_checker = True) + if env["SCONS_STAGE"] == "flags" : + env["UNITTEST_SOURCES"] = [] + env["UNITTEST_OBJECTS"] = [] + if env["SCONS_STAGE"] == "build" : + myenv = env.Clone() + myenv.UseFlags(env.get("CHECKER_FLAGS","")) + myenv.UseFlags(env.get("INJECTED_UNITTEST_FLAGS","")) # So things that piggy-back our build system can piggy-back our test system too + myenv.UseFlags(env.get("SLIMBER_FLAGS","")) + myenv.UseFlags(env.get("SWIFT_CONTROLLERS_FLAGS","")) + myenv.UseFlags(env.get("SWIFTOOLS_FLAGS","")) + myenv.UseFlags(env.get("LIMBER_FLAGS","")) + myenv.UseFlags(env.get("SWIFTEN_FLAGS","")) + myenv.UseFlags(env.get("CPPUNIT_FLAGS","")) + myenv.UseFlags(env.get("SWIFTEN_DEP_FLAGS", "")) + if env.get("HAVE_LIBXML") : + myenv.Append(CPPDEFINES = ["HAVE_LIBXML"]) + if env.get("HAVE_EXPAT") : + myenv.Append(CPPDEFINES = ["HAVE_EXPAT"]) + if env["TEST_CREATE_LIBRARIES"] : + lib = myenv.StaticLibrary("Swift_UnitTests", env["UNITTEST_SOURCES"] + env["UNITTEST_OBJECTS"]) + myenv.Program("checker", lib) + else : + checker = myenv.Program("checker", env["UNITTEST_SOURCES"] + env["UNITTEST_OBJECTS"]) + myenv.Test(checker, is_checker = True) |