diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2017-04-08 10:54:40 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2017-04-09 23:11:36 +0530 |
| commit | 4f0d42967e9f672ba4f2bbb5b9eea063490b545c (patch) | |
| tree | 0f1d68588b28f90c5133e2c3c0d113a0ec334892 | |
| parent | 68c8bb49c3d167e26666561f907146280111481b (diff) | |
| download | meson-4f0d42967e9f672ba4f2bbb5b9eea063490b545c.zip meson-4f0d42967e9f672ba4f2bbb5b9eea063490b545c.tar.gz meson-4f0d42967e9f672ba4f2bbb5b9eea063490b545c.tar.bz2 | |
tests: Move appveyor platform workaround to run_tests.py
This is also needed for the unit tests
| -rwxr-xr-x | run_project_tests.py | 15 | ||||
| -rwxr-xr-x | run_tests.py | 15 |
2 files changed, 15 insertions, 15 deletions
diff --git a/run_project_tests.py b/run_project_tests.py index 1a16880..bcb375d 100755 --- a/run_project_tests.py +++ b/run_project_tests.py @@ -622,21 +622,6 @@ if __name__ == '__main__': options = parser.parse_args() setup_commands(options.backend) - # Appveyor sets the `platform` environment variable which completely messes - # up building with the vs2010 and vs2015 backends. - # - # Specifically, MSBuild reads the `platform` environment variable to set - # the configured value for the platform (Win32/x64/arm), which breaks x86 - # builds. - # - # Appveyor setting this also breaks our 'native build arch' detection for - # Windows in environment.py:detect_windows_arch() by overwriting the value - # of `platform` set by vcvarsall.bat. - # - # While building for x86, `platform` should be unset. - if 'APPVEYOR' in os.environ and os.environ['arch'] == 'x86': - os.environ.pop('platform') - script_dir = os.path.split(__file__)[0] if script_dir != '': os.chdir(script_dir) diff --git a/run_tests.py b/run_tests.py index 846fc66..a30fd5d 100755 --- a/run_tests.py +++ b/run_tests.py @@ -127,6 +127,21 @@ if __name__ == '__main__': # Running on a developer machine? Be nice! if not mesonlib.is_windows() and 'TRAVIS' not in os.environ: os.nice(20) + # Appveyor sets the `platform` environment variable which completely messes + # up building with the vs2010 and vs2015 backends. + # + # Specifically, MSBuild reads the `platform` environment variable to set + # the configured value for the platform (Win32/x64/arm), which breaks x86 + # builds. + # + # Appveyor setting this also breaks our 'native build arch' detection for + # Windows in environment.py:detect_windows_arch() by overwriting the value + # of `platform` set by vcvarsall.bat. + # + # While building for x86, `platform` should be unset. + if 'APPVEYOR' in os.environ and os.environ['arch'] == 'x86': + os.environ.pop('platform') + # Run tests print('Running unittests.\n') units = ['InternalTests', 'AllPlatformTests'] if mesonlib.is_linux(): |