diff options
| author | DJ Delorie <dj@delorie.com> | 2021-06-15 08:50:20 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-15 08:50:20 -0400 |
| commit | f56eb85227bbcc7bd81232a338655146385a77ca (patch) | |
| tree | ce074f4d16fc57aebeba89bf5cd874ef02bc9bbf /.appveyor.yml | |
| parent | ff059dd96af6ba4daf7bc9ddf22d1d2dbf6a177b (diff) | |
| download | libffi-f56eb85227bbcc7bd81232a338655146385a77ca.tar.gz | |
Don't stop test on copy failure (#636)
* Don't stop test on copy failure
Static-library tests were failing only because there were
no DLLs to copy. This change makes a copy failure not stop
the build; if a failed copy would otherwise be relevent, the
later tests would fail anyway.
While there are more clever ways to solve this, a brute force
fix is sufficient.
* [TEST] Try cygwin64; install more packages explicitly
* use correct cygwin64 directory name
appveyor has cygwin64 pre-installed in /cygwin64, and 32-bit cygwin
in /cygwin
* More testing - revert VS change, bump travis timeout
* Add -g to update the rest of perl
* Skip execution tests on non-native platforms
Special site.exp that skips the unix_load() command for arm platforms.
Unset TERM to avoid cruft in stdout
Try harder to find the libffi libraries
Diffstat (limited to '.appveyor.yml')
| -rw-r--r-- | .appveyor.yml | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/.appveyor.yml b/.appveyor.yml index 1f82089..48fbb4d 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -21,8 +21,8 @@ configuration: environment: global: - CYG_ROOT: C:/cygwin - CYG_CACHE: C:/cygwin/var/cache/setup + CYG_ROOT: C:/cygwin64 + CYG_CACHE: C:/cygwin64/var/cache/setup CYG_MIRROR: http://mirrors.kernel.org/sourceware/cygwin/ VSVER: 15 matrix: @@ -61,8 +61,8 @@ install: } 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,automake' + - 'appveyor DownloadFile https://cygwin.com/setup-x86_64.exe -FileName setup.exe' + - 'setup.exe -qgnNdO -R "%CYG_ROOT%" -s "%CYG_MIRROR%" -l "%CYG_CACHE%" -P dejagnu -P autoconf -P automake -P libtool' - '%CYG_ROOT%/bin/bash -lc "cygcheck -dc cygwin"' - echo call VsDevCmd to set VS150COMNTOOLS - call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\Tools\VsDevCmd.bat" @@ -71,13 +71,14 @@ 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 $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')" + - c:\cygwin64\bin\sh -lc "(cd $OLDPWD; ./autogen.sh)" + - c:\cygwin64\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:\cygwin64\bin\sh -lc "(cd $OLDPWD; cp src/%SRC_ARCHITECTURE%/ffitarget.h include)" + - c:\cygwin64\bin\sh -lc "(cd $OLDPWD; make)" + - c:\cygwin64\bin\sh -lc "(cd $OLDPWD; cp $HOST/.libs/libffi.lib $HOST/testsuite/libffi-8.lib || true)" + - c:\cygwin64\bin\sh -lc "(cd $OLDPWD; cp `find . -name 'libffi-?.dll'` $HOST/testsuite/ || true)" + - c:\cygwin64\bin\sh -lc "(cd $OLDPWD; TERM=none make check RUNTESTFLAGS='-v -v -v -v --target '$HOST DEJAGNU=$PWD/.appveyor/site.exp SITEDIR=$PWD/.appveyor)" on_finish: - - c:\cygwin\bin\sh -lc "(cd $OLDPWD; cat `find ./ -name libffi.log`)" + - c:\cygwin64\bin\sh -lc "(cd $OLDPWD; cat `find ./ -name libffi.log`)" |