Since we started using `make distcheck` in travis, the part that's printing the
tests/test-suite.log file is rather pointless. Let's check for both known
locations (keeping the previous one there on purpose) so that the output is
usable again.
Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
---
.travis.yml | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/.travis.yml b/.travis.yml
index d3f72d46f3d9..f980884dfa1c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -118,8 +118,11 @@ script:
after_failure:
- echo '============================================================================'
- - 'if [ -f $(pwd)/tests/test-suite.log ]; then
+ - 'ver=$(sed -n "s/AC_INIT(\[libvirt\], \[\([0-9.]*\)\],.*/\1/p" configure.ac);
+ if [ -f $(pwd)/tests/test-suite.log ]; then
cat $(pwd)/tests/test-suite.log;
+ elif [ -f libvirt-$ver/_build/tests/test-suite.log ]; then
+ cat libvirt-$ver/_build/tests/test-suite.log;
else
echo "=== NO LOG FILE FOUND ===";
fi'
--
2.17.0
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
Ping? Trivial? On Tue, May 01, 2018 at 05:25:17PM +0200, Martin Kletzander wrote: >Since we started using `make distcheck` in travis, the part that's printing the >tests/test-suite.log file is rather pointless. Let's check for both known >locations (keeping the previous one there on purpose) so that the output is >usable again. > >Signed-off-by: Martin Kletzander <mkletzan@redhat.com> >--- > .travis.yml | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > >diff --git a/.travis.yml b/.travis.yml >index d3f72d46f3d9..f980884dfa1c 100644 >--- a/.travis.yml >+++ b/.travis.yml >@@ -118,8 +118,11 @@ script: > > after_failure: > - echo '============================================================================' >- - 'if [ -f $(pwd)/tests/test-suite.log ]; then >+ - 'ver=$(sed -n "s/AC_INIT(\[libvirt\], \[\([0-9.]*\)\],.*/\1/p" configure.ac); >+ if [ -f $(pwd)/tests/test-suite.log ]; then > cat $(pwd)/tests/test-suite.log; >+ elif [ -f libvirt-$ver/_build/tests/test-suite.log ]; then >+ cat libvirt-$ver/_build/tests/test-suite.log; > else > echo "=== NO LOG FILE FOUND ==="; > fi' >-- >2.17.0 > >-- >libvir-list mailing list >libvir-list@redhat.com >https://www.redhat.com/mailman/listinfo/libvir-list -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list
On Tue, May 01, 2018 at 05:25:17PM +0200, Martin Kletzander wrote: > Since we started using `make distcheck` in travis, the part that's printing the > tests/test-suite.log file is rather pointless. Let's check for both known > locations (keeping the previous one there on purpose) so that the output is > usable again. > > Signed-off-by: Martin Kletzander <mkletzan@redhat.com> > --- > .travis.yml | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/.travis.yml b/.travis.yml > index d3f72d46f3d9..f980884dfa1c 100644 > --- a/.travis.yml > +++ b/.travis.yml > @@ -118,8 +118,11 @@ script: > > after_failure: > - echo '============================================================================' > - - 'if [ -f $(pwd)/tests/test-suite.log ]; then > + - 'ver=$(sed -n "s/AC_INIT(\[libvirt\], \[\([0-9.]*\)\],.*/\1/p" configure.ac); > + if [ -f $(pwd)/tests/test-suite.log ]; then > cat $(pwd)/tests/test-suite.log; > + elif [ -f libvirt-$ver/_build/tests/test-suite.log ]; then > + cat libvirt-$ver/_build/tests/test-suite.log; Could have just used a "*" here since we build from clean git we know it will only expand to a single file, but not a real issue. > else > echo "=== NO LOG FILE FOUND ==="; > fi' Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :| -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list
On Mon, May 21, 2018 at 01:59:14PM +0100, Daniel P. Berrangé wrote: >On Tue, May 01, 2018 at 05:25:17PM +0200, Martin Kletzander wrote: >> Since we started using `make distcheck` in travis, the part that's printing the >> tests/test-suite.log file is rather pointless. Let's check for both known >> locations (keeping the previous one there on purpose) so that the output is >> usable again. >> >> Signed-off-by: Martin Kletzander <mkletzan@redhat.com> >> --- >> .travis.yml | 5 ++++- >> 1 file changed, 4 insertions(+), 1 deletion(-) >> >> diff --git a/.travis.yml b/.travis.yml >> index d3f72d46f3d9..f980884dfa1c 100644 >> --- a/.travis.yml >> +++ b/.travis.yml >> @@ -118,8 +118,11 @@ script: >> >> after_failure: >> - echo '============================================================================' >> - - 'if [ -f $(pwd)/tests/test-suite.log ]; then >> + - 'ver=$(sed -n "s/AC_INIT(\[libvirt\], \[\([0-9.]*\)\],.*/\1/p" configure.ac); >> + if [ -f $(pwd)/tests/test-suite.log ]; then >> cat $(pwd)/tests/test-suite.log; >> + elif [ -f libvirt-$ver/_build/tests/test-suite.log ]; then >> + cat libvirt-$ver/_build/tests/test-suite.log; > >Could have just used a "*" here since we build from clean git we know >it will only expand to a single file, but not a real issue. > Honestly, I had to run several builds because the shell expansions and all the escaping was really fishy and I didn't feel like experimenting with travis more than I needed when it finally started working =) >> else >> echo "=== NO LOG FILE FOUND ==="; >> fi' > >Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> > Thanks, will push shortly. >Regards, >Daniel >-- >|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| >|: https://libvirt.org -o- https://fstop138.berrange.com :| >|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :| > >-- >libvir-list mailing list >libvir-list@redhat.com >https://www.redhat.com/mailman/listinfo/libvir-list -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list
© 2016 - 2025 Red Hat, Inc.