diff options
| -rw-r--r-- | .appveyor.yml | 23 | ||||
| -rw-r--r-- | README.md | 3 | ||||
| -rwxr-xr-x | run_tests.py | 4 | ||||
| -rw-r--r-- | test cases/common/86 same basename/meson.build | 6 | ||||
| -rw-r--r-- | test cases/common/86 same basename/sub/meson.build | 1 |
5 files changed, 32 insertions, 5 deletions
diff --git a/.appveyor.yml b/.appveyor.yml new file mode 100644 index 0000000..d5e0fbf --- /dev/null +++ b/.appveyor.yml @@ -0,0 +1,23 @@ +version: 1.0.{build} + +os: Visual Studio 2015 + +platform: + - x86 + +branches: + only: + - master + +install: + - ps: (new-object net.webclient).DownloadFile('https://www.python.org/ftp/python/3.4.4/python-3.4.4.msi', 'python-3.4.4.msi') + - ps: msiexec /i python-3.4.4.msi /quiet /qn /norestart + - ps: (new-object net.webclient).DownloadFile('https://dl.dropboxusercontent.com/u/37517477/ninja.exe', 'c:\python34\ninja.exe') + - cmd: copy c:\python34\python.exe c:\python34\python3.exe + - '"C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x86' + +build_script: + - cmd: echo No build step. + +test_script: + - cmd: PATH c:\python34;%PATH% && python3 run_tests.py --backend=ninja @@ -6,8 +6,7 @@ build system. ####Build status -<a href="https://travis-ci.org/mesonbuild/meson"><img -src="https://travis-ci.org/mesonbuild/meson.svg?branch=master"></a> +[](https://travis-ci.org/mesonbuild/meson) [](https://ci.appveyor.com/project/jpakkane/meson) ####Dependencies diff --git a/run_tests.py b/run_tests.py index 1c6ae11..5fdfce9 100755 --- a/run_tests.py +++ b/run_tests.py @@ -406,7 +406,7 @@ def generate_prebuilt_object(): else: raise RuntimeError("Could not find C compiler.") cmd = [cmd, '-c', source, '-o', objectfile] - subprocess.check_call(cmd) + subprocess.check_call(cmd, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL) return objectfile if __name__ == '__main__': @@ -431,7 +431,7 @@ if __name__ == '__main__': print('\nTotal passed tests:', passing_tests) print('Total failed tests:', failing_tests) print('Total skipped tests:', skipped_tests) - if failing_tests > 0 and 'TRAVIS' in os.environ: + if failing_tests > 0 and ('TRAVIS' in os.environ or 'APPVEYOR' in os.environ): # Cat because it can have stuff of unknown encodings mixed. subprocess.call(['cat', 'meson-test-run.txt']) sys.exit(failing_tests) diff --git a/test cases/common/86 same basename/meson.build b/test cases/common/86 same basename/meson.build index ba88dfd..e320f95 100644 --- a/test cases/common/86 same basename/meson.build +++ b/test cases/common/86 same basename/meson.build @@ -3,9 +3,13 @@ project('same basename', 'c') # Use the same source file to check that each top level target # has its own unique working directory. If they don't # then the .o files will clobber each other. -stlib = static_library('name', 'lib.c', c_args : '-DSTAT') shlib = shared_library('name', 'lib.c', c_args : '-DSHAR') +# On Windows a static lib is a foo.lib but a share library +# is both a foo.dll and a foo.lib. Put static in subdir to avoid +# name clashes. +subdir('sub') + exe1 = executable('name', 'exe1.c', link_with : stlib) exe2 = executable('name2', 'exe2.c', link_with : shlib) diff --git a/test cases/common/86 same basename/sub/meson.build b/test cases/common/86 same basename/sub/meson.build new file mode 100644 index 0000000..07250a5 --- /dev/null +++ b/test cases/common/86 same basename/sub/meson.build @@ -0,0 +1 @@ +stlib = static_library('name', '../lib.c', c_args : '-DSTAT') |