diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2016-06-13 22:42:10 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2016-06-13 22:50:47 +0300 |
| commit | 15ab984d8e2cf396be385d7515f72561c3cbaaa2 (patch) | |
| tree | 0113a737cb4bf2bdb9435adf5f0a7a7c7b6f9dd8 | |
| parent | cb64cb34c0f4041b3fe190dd68c0d9c7dbce1930 (diff) | |
| download | meson-15ab984d8e2cf396be385d7515f72561c3cbaaa2.zip meson-15ab984d8e2cf396be385d7515f72561c3cbaaa2.tar.gz meson-15ab984d8e2cf396be385d7515f72561c3cbaaa2.tar.bz2 | |
Finish appveyor integration by moving static library in a subdir to avoid clashes.
| -rw-r--r-- | .appveyor.yml | 2 | ||||
| -rwxr-xr-x | run_tests.py | 2 | ||||
| -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 |
4 files changed, 7 insertions, 4 deletions
diff --git a/.appveyor.yml b/.appveyor.yml index 4b9432a..d5e0fbf 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -13,8 +13,6 @@ 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: echo %PATH% - - cmd: dir c:\python34 - cmd: copy c:\python34\python.exe c:\python34\python3.exe - '"C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x86' diff --git a/run_tests.py b/run_tests.py index 50aa006..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__': 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') |