| Message ID | 20200309211155.4020260-2-ihrachys@redhat.com |
|---|---|
| State | Superseded, archived |
| Commit | 4e5c87e9e73f6787827d37178bfd2672dae19f0d |
| Headers | show |
| Series | [ovs-dev,ovn,1/2] travis: Dump config.log if make fails. | expand |
On Tue, Mar 10, 2020 at 2:43 AM Ihar Hrachyshka <ihrachys@redhat.com> wrote: > > 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.) > > Adopted from https://patchwork.ozlabs.org/patch/1164305/ > (4e5c87e9e73f6787827d37178bfd2672dae19f0d in ovs tree). > > Signed-off-by: Ihar Hrachyshka <ihrachys@redhat.com> Thanks Ihar. I applied both the patches in this serial to master. Numan > --- > .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 98bc0ee4a..1d08eb35c 100755 > --- a/.travis/linux-build.sh > +++ b/.travis/linux-build.sh > @@ -44,7 +44,7 @@ if [ "$TESTSUITE" ]; then > export DISTCHECK_CONFIGURE_FLAGS="$OPTS --with-ovs-source=$PWD/ovs_src" > if ! make distcheck -j4 TESTSUITEFLAGS="-j4 -k ovn" 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 a0aaa5e85..6617f0b9d 100755 > --- a/.travis/osx-build.sh > +++ b/.travis/osx-build.sh > @@ -35,7 +35,7 @@ if [ "$TESTSUITE" ] && [ "$CC" != "clang" ]; then > export DISTCHECK_CONFIGURE_FLAGS="$EXTRA_OPTS --with-ovs-source=$PWD/ovs_src" > 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.24.1 > > _______________________________________________ > dev mailing list > dev@openvswitch.org > https://mail.openvswitch.org/mailman/listinfo/ovs-dev >
diff --git a/.travis/linux-build.sh b/.travis/linux-build.sh index 98bc0ee4a..1d08eb35c 100755 --- a/.travis/linux-build.sh +++ b/.travis/linux-build.sh @@ -44,7 +44,7 @@ if [ "$TESTSUITE" ]; then export DISTCHECK_CONFIGURE_FLAGS="$OPTS --with-ovs-source=$PWD/ovs_src" if ! make distcheck -j4 TESTSUITEFLAGS="-j4 -k ovn" 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 a0aaa5e85..6617f0b9d 100755 --- a/.travis/osx-build.sh +++ b/.travis/osx-build.sh @@ -35,7 +35,7 @@ if [ "$TESTSUITE" ] && [ "$CC" != "clang" ]; then export DISTCHECK_CONFIGURE_FLAGS="$EXTRA_OPTS --with-ovs-source=$PWD/ovs_src" 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
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.) Adopted from https://patchwork.ozlabs.org/patch/1164305/ (4e5c87e9e73f6787827d37178bfd2672dae19f0d in ovs tree). Signed-off-by: Ihar Hrachyshka <ihrachys@redhat.com> --- .travis/linux-build.sh | 2 +- .travis/osx-build.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)