[ovs-dev] [PATCH v2 python3 1/6] travis: Obtain testsuite logs from the correct directory.

Ben Pfaff blp at ovn.org
Wed Sep 18 23:33:17 UTC 2019


These days Automake uses _build/sub for its distcheck builds, not
plain _build.  (I don't know whether that is a change from previous
versions.)

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

diff --git a/.travis/linux-build.sh b/.travis/linux-build.sh
index 1577ae51659d..661d5e89ed70 100755
--- a/.travis/linux-build.sh
+++ b/.travis/linux-build.sh
@@ -172,7 +172,7 @@ if [ "$TESTSUITE" ]; then
     export DISTCHECK_CONFIGURE_FLAGS="$OPTS"
     if ! make distcheck TESTSUITEFLAGS=-j4 RECHECK=yes; then
         # testsuite.log is necessary for debugging.
-        cat */_build/tests/testsuite.log
+        cat */_build/sub/tests/testsuite.log
         exit 1
     fi
 else
diff --git a/.travis/osx-build.sh b/.travis/osx-build.sh
index f11d7b9af5d6..909173061a71 100755
--- a/.travis/osx-build.sh
+++ b/.travis/osx-build.sh
@@ -20,7 +20,7 @@ fi
 if [ "$TESTSUITE" ] && [ "$CC" != "clang" ]; then
     if ! make distcheck RECHECK=yes; then
         # testsuite.log is necessary for debugging.
-        cat */_build/tests/testsuite.log
+        cat */_build/sub/tests/testsuite.log
         exit 1
     fi
 fi
-- 
2.21.0



More information about the dev mailing list