travis: reworked test runner

1 files changed, 12 insertions, 21 deletions

diff --git a/.travis/targets/win32.sh b/.travis/targets/win32.sh
index 1c64856..ec3ed03 100644
--- a/.travis/targets/win32.sh
+++ b/.travis/targets/win32.sh
@@ -1,39 +1,30 @@
 build() {
-    unset CC
-    pushd build > /dev/null
-    ../configure \
+    default_configure \
+        CC= \
         CFLAGS="-O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4" \
         --host=i686-w64-mingw32 \
         --target=i686-w64-mingw32 \
-        --enable-ronn \
-        --disable-silent-rules \
         --disable-tests \
-        --disable-valgrind \
         --disable-git-receiver \
-        --disable-make-embedded \
+        --disable-make \
         --disable-runserver
-    popd > /dev/null
+    make blogc.exe
 
-    make -C build blogc.exe
-
-    PN="$(grep PACKAGE_TARNAME build/config.h | cut -d\" -f2)"
-    PV="$(grep PACKAGE_VERSION build/config.h | cut -d\" -f2)"
+    PN="$(grep PACKAGE_TARNAME config.h | cut -d\" -f2)"
+    PV="$(grep PACKAGE_VERSION config.h | cut -d\" -f2)"
     DEST_DIR="${PN}-${PV}-${TARGET}"
 
     rm -rf "${DEST_DIR}"
     mkdir -p "${DEST_DIR}"
 
-    cp build/.libs/blogc.exe "${DEST_DIR}/"
-    cp LICENSE "${DEST_DIR}/"
-    cp README.md "${DEST_DIR}/"
-
-    zip "build/${DEST_DIR}.zip" "${DEST_DIR}"/*
-}
+    cp .libs/blogc.exe "${DEST_DIR}/"
+    cp ../LICENSE "${DEST_DIR}/"
+    cp ../README.md "${DEST_DIR}/"
 
-deploy_cond() {
-    [[ "x${CC}" = "xgcc" ]]
+    zip "${DEST_DIR}.zip" "${DEST_DIR}"/*
 }
 
 deploy() {
-    FILES=( build/*.zip )
+    FILES=( *.zip )
+    [[ ${RV} -eq 0 ]] && [[ "x${CC}" = "xgcc" ]]
 }