Finish appveyor integration by moving static library in a subdir to avoid clashes.

.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'
 

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__':

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)
 

test cases/common/86 same basename/sub/meson.build

@@ -0,0 +1 @@
+stlib = static_library('name', '../lib.c', c_args : '-DSTAT')