travis: reworked test runner

7 files changed, 55 insertions, 128 deletions

diff --git a/.travis/targets/dist-srpm.sh b/.travis/targets/dist-srpm.sh
index 732b768..aa4e9e8 100644
--- a/.travis/targets/dist-srpm.sh
+++ b/.travis/targets/dist-srpm.sh
@@ -1,23 +1,9 @@
 build() {
-    pushd build > /dev/null
-    ../configure \
-        CFLAGS="-Wall -g -O0" \
-        --disable-silent-rules \
-        --enable-ronn \
-        --enable-tests \
-        --enable-valgrind \
-        --enable-git-receiver \
-        --enable-make \
-        --enable-runserver
-    popd > /dev/null
-
-    make -C build dist-srpm
-}
-
-deploy_cond() {
-    [[ "x${CC}" = "xgcc" ]]
+    default_configure
+    make dist-srpm
 }
 
 deploy() {
-    FILES=( build/*.src.rpm )
+    FILES=( *.src.rpm )
+    [[ ${RV} -eq 0 ]] && [[ "x${CC}" = "xgcc" ]]
 }
diff --git a/.travis/targets/distcheck.sh b/.travis/targets/distcheck.sh
index 3bf352d..e1cd9c5 100644
--- a/.travis/targets/distcheck.sh
+++ b/.travis/targets/distcheck.sh
@@ -1,22 +1,9 @@
 build() {
-    pushd build > /dev/null
-    ../configure \
-        CFLAGS="-Wall -g -O0" \
-        --disable-silent-rules \
-        --enable-ronn \
-        --enable-tests \
-        --enable-git-receiver \
-        --enable-make \
-        --enable-runserver
-    popd > /dev/null
-
-    make -C build distcheck
-}
-
-deploy_cond() {
-    [[ "x${CC}" = "xgcc" ]]
+    default_configure
+    make distcheck
 }
 
 deploy() {
-    FILES=( build/*.{*.tar.{gz,bz2,xz},zip} )
+    FILES=( *.{*.tar.{gz,bz2,xz},zip} )
+    [[ ${RV} -eq 0 ]] && [[ "x${CC}" = "xgcc" ]]
 }
diff --git a/.travis/targets/github-lambda.sh b/.travis/targets/github-lambda.sh
index 2a95ca5..d0bb42f 100644
--- a/.travis/targets/github-lambda.sh
+++ b/.travis/targets/github-lambda.sh
@@ -1,40 +1,32 @@
 build() {
-    pushd build > /dev/null
-    ../configure \
-        CFLAGS="-Wall -g -O0" \
-        --enable-ronn \
-        --disable-silent-rules \
+    default_configure \
+        CFLAGS="-Wall -g -O2" \
         --disable-tests \
-        --disable-valgrind \
         --disable-git-receiver \
-        --enable-make-embedded \
-        --disable-runserver
-    popd > /dev/null
+        --disable-runserver \
+        --enable-make-embedded
 
-    make -C build LDFLAGS="-all-static" blogc
+    make LDFLAGS="-all-static" blogc
 
-    rm -rf build/root
-    mkdir -p build/root
+    rm -rf root
+    mkdir -p root
 
-    PV="$(grep PACKAGE_VERSION build/config.h | cut -d\" -f2)"
+    PV="$(grep PACKAGE_VERSION config.h | cut -d\" -f2)"
 
-    install -m 755 build/blogc build/root/blogc
-    install -m 644 build/src/blogc-github-lambda/lambda_function.py build/root/lambda_function.py
-    install -m 644 LICENSE build/root/LICENSE
-    strip build/root/blogc
+    install -m 755 blogc root/blogc
+    install -m 644 src/blogc-github-lambda/lambda_function.py root/lambda_function.py
+    install -m 644 ../LICENSE root/LICENSE
+    strip root/blogc
 
-    pushd build/root/ > /dev/null
+    pushd root > /dev/null
     zip "../blogc-github-lambda-${PV}.zip" *
     popd > /dev/null
 
-    install -m 755 build/root/blogc "build/blogc-static-amd64-${PV}"
-    xz -z "build/blogc-static-amd64-${PV}"
-}
-
-deploy_cond() {
-    [[ "x${CC}" = "xgcc" ]]
+    install -m 755 root/blogc "blogc-static-amd64-${PV}"
+    xz -z "blogc-static-amd64-${PV}"
 }
 
 deploy() {
-    FILES=( build/*.zip build/blogc-static-*.xz )
+    FILES=( *.zip blogc-static-*.xz )
+    [[ ${RV} -eq 0 ]] && [[ "x${CC}" = "xgcc" ]]
 }
diff --git a/.travis/targets/make-embedded.sh b/.travis/targets/make-embedded.sh
index b2d3f80..d83c88a 100644
--- a/.travis/targets/make-embedded.sh
+++ b/.travis/targets/make-embedded.sh
@@ -1,15 +1,5 @@
 build() {
-    pushd build > /dev/null
-    ../configure \
-        CFLAGS="-Wall -g -O0" \
-        --enable-ronn \
-        --disable-silent-rules \
-        --enable-tests \
-        --enable-valgrind \
-        --enable-git-receiver \
-        --enable-make-embedded \
-        --enable-runserver
-    popd > /dev/null
-
-    make -C build check
+    default_configure \
+        --enable-make-embedded
+    make check
 }
diff --git a/.travis/targets/valgrind.sh b/.travis/targets/valgrind.sh
index 7870ec1..55d3faa 100644
--- a/.travis/targets/valgrind.sh
+++ b/.travis/targets/valgrind.sh
@@ -1,15 +1,5 @@
 build() {
-    pushd build > /dev/null
-    ../configure \
-        CFLAGS="-Wall -g -O0" \
-        --disable-silent-rules \
-        --enable-ronn \
-        --enable-tests \
-        --enable-valgrind \
-        --enable-git-receiver \
-        --enable-make \
-        --enable-runserver
-    popd > /dev/null
-
-    make -C build valgrind
+    default_configure \
+        --enable-valgrind
+    make valgrind
 }
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" ]]
 }
diff --git a/.travis/targets/win64.sh b/.travis/targets/win64.sh
index 47d82ee..e6c4199 100644
--- a/.travis/targets/win64.sh
+++ b/.travis/targets/win64.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=x86_64-w64-mingw32 \
         --target=x86_64-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" ]]
 }