diff options
| author | ericLemanissier <ericLemanissier@users.noreply.github.com> | 2021-03-24 12:20:27 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-24 07:20:27 -0400 |
| commit | 01b56f4b3e89a349228c4ccf55061d847153c8d6 (patch) | |
| tree | 70208a8d8423046257239b6412946ac7028d1dda | |
| parent | 1aeb26714ec30649f5d9de5b4884a4ac46f5f474 (diff) | |
| download | libffi-01b56f4b3e89a349228c4ccf55061d847153c8d6.tar.gz | |
fix windows tests (#595)
* Update .appveyor.yml
* add (debug+release)*(shared+static) CI
* fix libversion
| -rw-r--r-- | .appveyor.yml | 27 | ||||
| -rwxr-xr-x | msvcc.sh | 2 |
2 files changed, 23 insertions, 6 deletions
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`)" @@ -52,7 +52,7 @@ ml="ml" safeseh="-safeseh" output= libpaths= -libversion=7 +libversion=8 verbose= while [ $# -gt 0 ] |