diff options
| -rwxr-xr-x | run_tests.py | 9 | ||||
| -rw-r--r-- | scons/SConstruct | 16 | ||||
| -rw-r--r-- | scons/SConstruct.common | 9 | ||||
| -rwxr-xr-x | test/run_tests_util.py | 4 |
4 files changed, 9 insertions, 29 deletions
diff --git a/run_tests.py b/run_tests.py index aa2313e1..e1084056 100755 --- a/run_tests.py +++ b/run_tests.py @@ -39,12 +39,6 @@ import sys SCRIPT_DIR = os.path.dirname(__file__) or '.' -# Some Python tests don't work in all configurations. -PYTHON_TESTS_TO_SKIP = ( - ('win-dbg', 'gtest_throw_on_failure_test.py'), - ('win-opt', 'gtest_throw_on_failure_test.py'), - ) - sys.path.append(os.path.join(SCRIPT_DIR, 'test')) import run_tests_util @@ -56,8 +50,7 @@ def _Main(): test_runner = run_tests_util.TestRunner(script_dir=SCRIPT_DIR) tests = test_runner.GetTestsToRun(args, options.configurations, - options.built_configurations, - python_tests_to_skip=PYTHON_TESTS_TO_SKIP) + options.built_configurations) if not tests: sys.exit(1) # Incorrect parameters given, abort execution. diff --git a/scons/SConstruct b/scons/SConstruct index f4f82374..5c0b038a 100644 --- a/scons/SConstruct +++ b/scons/SConstruct @@ -39,7 +39,7 @@ # where frequently used command-line options include: # -h print usage help. # BUILD=all build all build types. -# BUILD=win-opt build the given build type. +# BUILD=win-opt8 build the given build type. EnsurePythonVersion(2, 3) @@ -49,18 +49,10 @@ sconstruct_helper.Initialize(build_root_path='..', support_multiple_win_builds=False) win_base = sconstruct_helper.MakeWinBaseEnvironment() +win_base['GTEST_BUILD_DLL_TEST'] = True -# We don't support VC 7.1 with exceptions disabled, so we always -# enable exceptions for VC 7.1. For newer versions of VC, we still -# compile with exceptions disabled by default, as that's a more common -# setting for our users. -if win_base.get('MSVS_VERSION', None) == '7.1': - sconstruct_helper.EnableExceptions(win_base) -else: - win_base['GTEST_BUILD_DLL_TEST'] = True - -sconstruct_helper.MakeWinDebugEnvironment(win_base, 'win-dbg') -sconstruct_helper.MakeWinOptimizedEnvironment(win_base, 'win-opt') +sconstruct_helper.MakeWinDebugEnvironment(win_base, 'win-dbg8') +sconstruct_helper.MakeWinOptimizedEnvironment(win_base, 'win-opt8') sconstruct_helper.ConfigureGccEnvironments() diff --git a/scons/SConstruct.common b/scons/SConstruct.common index 10947aea..59b8864b 100644 --- a/scons/SConstruct.common +++ b/scons/SConstruct.common @@ -56,10 +56,7 @@ class SConstructHelper: test_env = Environment() platform = test_env['PLATFORM'] if platform == 'win32': - if support_multiple_win_builds: - available_build_types = ['win-dbg8', 'win-opt8', 'win-dbg', 'win-opt'] - else: - available_build_types = ['win-dbg', 'win-opt'] + available_build_types = ['win-dbg8', 'win-opt8'] elif platform == 'darwin': # MacOSX available_build_types = ['mac-dbg', 'mac-opt'] else: @@ -144,7 +141,7 @@ class SConstructHelper: self.env_dict[name] = env def MakeWinDebugEnvironment(self, base_environment, name): - """Takes a VC71 or VC80 base environment and adds debug settings.""" + """Takes an MSVC base environment and adds debug settings.""" debug_env = base_environment.Clone() self.SetBuildNameAndDir(debug_env, name) debug_env.Append( @@ -164,7 +161,7 @@ class SConstructHelper: return debug_env def MakeWinOptimizedEnvironment(self, base_environment, name): - """Takes a VC71 or VC80 base environment and adds release settings.""" + """Takes an MSVC base environment and adds release settings.""" optimized_env = base_environment.Clone() self.SetBuildNameAndDir(optimized_env, name) optimized_env.Append( diff --git a/test/run_tests_util.py b/test/run_tests_util.py index fb7fd387..9e57931e 100755 --- a/test/run_tests_util.py +++ b/test/run_tests_util.py @@ -111,8 +111,6 @@ KNOWN BUILD DIRECTORIES On Windows: <%(proj)s root>/scons/build/win-dbg8/%(proj)s/scons/ <%(proj)s root>/scons/build/win-opt8/%(proj)s/scons/ - <%(proj)s root>/scons/build/win-dbg/%(proj)s/scons/ - <%(proj)s root>/scons/build/win-opt/%(proj)s/scons/ On Mac: <%(proj)s root>/scons/build/mac-dbg/%(proj)s/scons/ <%(proj)s root>/scons/build/mac-opt/%(proj)s/scons/ @@ -127,7 +125,7 @@ IS_CYGWIN = os.name == 'posix' and 'CYGWIN' in os.uname()[0] # Definition of CONFIGS must match that of the build directory names in the # SConstruct script. The first list item is the default build configuration. if IS_WINDOWS: - CONFIGS = ('win-dbg8', 'win-opt8', 'win-dbg', 'win-opt') + CONFIGS = ('win-dbg8', 'win-opt8') elif IS_MAC: CONFIGS = ('mac-dbg', 'mac-opt') else: |