From 6eb7dd11ecf6c713f9d31bf3799635475bd77ecf Mon Sep 17 00:00:00 2001 From: Tobias Brunner Date: Wed, 19 Jul 2017 12:34:35 +0200 Subject: [PATCH] appveyor: Run tests on AppVeyor Windows containers We can't enable leak detective as it is so slow then that we run into a timeout (60 minutes). --- .appveyor.yml | 25 +++++++++++++++++++++++++ scripts/test.sh | 8 +++++--- 2 files changed, 30 insertions(+), 3 deletions(-) create mode 100644 .appveyor.yml diff --git a/.appveyor.yml b/.appveyor.yml new file mode 100644 index 0000000000..941f4c2053 --- /dev/null +++ b/.appveyor.yml @@ -0,0 +1,25 @@ +clone_depth: 50 + +environment: + global: + TESTS_REDUCED_KEYLENGTHS: yes + LEAK_DETECTIVE: no + MONOLITHIC: yes + TZ: Europe/Zurich + matrix: + - arch: x86_64 + bits: 64 + # no 32-bit build as 32-bit msys is not installed + #- arch: i686 + # bits: 32 + +install: + - set MSYS_SH=C:\msys%BITS%\usr\bin\sh.exe + - set MSYSTEM=MINGW%BITS% + - set TEST=win%BITS% + +build_script: + - '%MSYS_SH% --login -c ". /etc/profile && cd $APPVEYOR_BUILD_FOLDER && ./scripts/test.sh deps"' + +test_script: + - '%MSYS_SH% --login -c ". /etc/profile && cd $APPVEYOR_BUILD_FOLDER && ./scripts/test.sh"' diff --git a/scripts/test.sh b/scripts/test.sh index 22e74033e2..238102f320 100755 --- a/scripts/test.sh +++ b/scripts/test.sh @@ -64,8 +64,10 @@ win*) --enable-tnccs-20 --enable-imc-attestation --enable-imv-attestation --enable-imc-os --enable-imv-os --enable-tnc-imv --enable-tnc-imc --enable-pki --enable-swanctl --enable-socket-win" - # no make check for Windows binaries - TARGET= + # no make check for Windows binaries unless we run on a windows host + if test "$APPVEYOR" != "True"; then + TARGET= + fi CFLAGS="$CFLAGS -mno-ms-bitfields" DEPS="gcc-mingw-w64-base" case "$TEST" in @@ -76,7 +78,7 @@ win*) DEPS="gcc-mingw-w64-x86-64 binutils-mingw-w64-x86-64 mingw-w64-x86-64-dev $DEPS" CC="x86_64-w64-mingw32-gcc" # apply patch to MinGW headers - if test -z "$1"; then + if test "$APPVEYOR" != "True" -a -z "$1"; then sudo patch -f -p 4 -d /usr/share/mingw-w64/include < src/libcharon/plugins/kernel_wfp/mingw-w64-4.8.1.diff fi ;; -- 2.47.2