Commit 01b56f4b3e89a349228c4ccf55061d847153c8d6
2021-03-24T12:20:27
fix windows tests (#595) * Update .appveyor.yml * add (debug+release)*(shared+static) CI * fix libversion
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68
diff --git a/.appveyor.yml b/.appveyor.yml
index ece8a94..e1fb634 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -15,13 +15,19 @@ platform:
- arm
- arm64
+configuration:
+ - Debug
+ - Release
+
environment:
global:
CYG_ROOT: C:/cygwin
CYG_CACHE: C:/cygwin/var/cache/setup
CYG_MIRROR: http://mirrors.kernel.org/sourceware/cygwin/
+ VSVER: 15
matrix:
- - VSVER: 15
+ - SHARED_ARG: "--enable-shared --disable-static"
+ - SHARED_ARG: "--enable-static --disable-shared"
install:
- ps: >-
@@ -50,6 +56,11 @@ install:
$env:MSVCC="/cygdrive/c/projects/libffi/msvcc.sh -m64"
$env:SRC_ARCHITECTURE="x86"
}
+ If ($env:Configuration -Match "Debug") {
+ $env:DEBUG_ARG="--enable-debug"
+ } Else {
+ $env:DEBUG_ARG="--disable-debug"
+ }
- 'appveyor DownloadFile https://cygwin.com/setup-x86.exe -FileName setup.exe'
- 'setup.exe -qnNdO -R "%CYG_ROOT%" -s "%CYG_MIRROR%" -l "%CYG_CACHE%" -P dejagnu >NUL'
- '%CYG_ROOT%/bin/bash -lc "cygcheck -dc cygwin"'
@@ -60,7 +71,13 @@ install:
- call "%VSCOMNTOOLS%..\..\vc\Auxiliary\Build\vcvarsall.bat" %VCVARS_PLATFORM%
build_script:
- - c:\cygwin\bin\sh -lc "(cd $OLDPWD; ./autogen.sh;)"
- - c:\cygwin\bin\sh -lc "(cd $OLDPWD; ./configure CC='%MSVCC%' CXX='%MSVCC%' LD='link' CPP='cl -nologo -EP' CXXCPP='cl -nologo -EP' CPPFLAGS='-DFFI_BUILDING_DLL' AR='/cygdrive/c/projects/libffi/.travis/ar-lib lib' NM='dumpbin -symbols' STRIP=':' --build=$BUILD --host=$HOST;)"
- - c:\cygwin\bin\sh -lc "(cd $OLDPWD; cp src/%SRC_ARCHITECTURE%/ffitarget.h include; make; find .;)"
- - c:\cygwin\bin\sh -lc "(cd $OLDPWD; cp `find . -name 'libffi-?.dll'` $HOST/testsuite/; make check; cat `find ./ -name libffi.log`)"
+ - c:\cygwin\bin\sh -lc "(cd $OLDPWD; ./autogen.sh)"
+ - c:\cygwin\bin\sh -lc "(cd $OLDPWD; ./configure CC='%MSVCC%' CXX='%MSVCC%' LD='link' CPP='cl -nologo -EP' CXXCPP='cl -nologo -EP' CPPFLAGS='-DFFI_BUILDING_DLL' AR='/cygdrive/c/projects/libffi/.travis/ar-lib lib' NM='dumpbin -symbols' STRIP=':' --build=$BUILD --host=$HOST $DEBUG_ARG $SHARED_ARG)"
+ - c:\cygwin\bin\sh -lc "(cd $OLDPWD; cp src/%SRC_ARCHITECTURE%/ffitarget.h include)"
+ - c:\cygwin\bin\sh -lc "(cd $OLDPWD; make)"
+ - c:\cygwin\bin\sh -lc "(cd $OLDPWD; cp `find . -name 'libffi-?.dll'` $HOST/testsuite/)"
+ - c:\cygwin\bin\sh -lc "(cd $OLDPWD; make check RUNTESTFLAGS='-v -v -v -v')"
+
+
+on_finish:
+ - c:\cygwin\bin\sh -lc "(cd $OLDPWD; cat `find ./ -name libffi.log`)"
diff --git a/msvcc.sh b/msvcc.sh
index 7cfc509..301e2fb 100755
--- a/msvcc.sh
+++ b/msvcc.sh
@@ -52,7 +52,7 @@ ml="ml"
safeseh="-safeseh"
output=
libpaths=
-libversion=7
+libversion=8
verbose=
while [ $# -gt 0 ]