[ovs-dev,v2,python3,2/6] travis: Dump config.log if make fails.
diff mbox series

Message ID 20190918233322.24305-3-blp@ovn.org
State New
Headers show
Series
  • Remove Python 2 support
Related show

Commit Message

Ben Pfaff Sept. 18, 2019, 11:33 p.m. UTC
This is sometimes useful for debugging.

Signed-off-by: Ben Pfaff <blp@ovn.org>
---
 .travis/linux-build.sh | 2 +-
 .travis/osx-build.sh   | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

Patch
diff mbox series

diff --git a/.travis/linux-build.sh b/.travis/linux-build.sh
index 661d5e89ed70..89496e2a275b 100755
--- a/.travis/linux-build.sh
+++ b/.travis/linux-build.sh
@@ -132,7 +132,7 @@  function build_ovs()
         make -j4
         popd
     else
-        make -j4
+        make -j4 || { cat config.log; exit 1; }
     fi
 }
 
diff --git a/.travis/osx-build.sh b/.travis/osx-build.sh
index 909173061a71..bf2c13fa3c1a 100755
--- a/.travis/osx-build.sh
+++ b/.travis/osx-build.sh
@@ -13,9 +13,13 @@  function configure_ovs()
 configure_ovs $EXTRA_OPTS $*
 
 if [ "$CC" = "clang" ]; then
-    make CFLAGS="$CFLAGS -Wno-error=unused-command-line-argument"
+    set make CFLAGS="$CFLAGS -Wno-error=unused-command-line-argument"
 else
-    make CFLAGS="$CFLAGS $BUILD_ENV"
+    set make CFLAGS="$CFLAGS $BUILD_ENV"
+fi
+if ! "$@"; then
+    cat config.log
+    exit 1
 fi
 if [ "$TESTSUITE" ] && [ "$CC" != "clang" ]; then
     if ! make distcheck RECHECK=yes; then