[xfstests-bld PATCH] gen-tarball: add 'set -e'

[xfstests-bld PATCH] gen-tarball: add 'set -e'

[Eric Biggers]

From: Eric Biggers <ebiggers@google.com>

The latest master branch of xfstests is missing a Makefile in
tests/ceph/, which broke xfstests's 'make install'.  But gen-tarball
didn't notice this.  Fix this by adding 'set -e', and to make this work
adjust a couple other commands that are expected to fail.

Signed-off-by: Eric Biggers <ebiggers@google.com>
---
 gen-tarball | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/gen-tarball b/gen-tarball
index 7d38b95..f925b39 100755
--- a/gen-tarball
+++ b/gen-tarball
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -e
+
 if test -f config.custom ; then
 	. config.custom
 else
@@ -72,15 +74,19 @@ if test -d bld/usr/bin ; then
     cp bld/usr/bin/* xfstests/bin
 fi
 cp bld/lib/client.txt xfstests/lib
-cp bld/lib/libimaevm.so.0.0.0 xfstests/lib
-ln -s libimaevm.so.0.0.0 xfstests/lib/libimaevm.so.0
+# ima-evm-utils is optional.
+if test -e bld/lib/libimaevm.so.0.0.0; then
+    cp bld/lib/libimaevm.so.0.0.0 xfstests/lib
+    ln -s libimaevm.so.0.0.0 xfstests/lib/libimaevm.so.0
+fi
 rm -f xfstests/bin/compile_et xfstests/bin/mk_cmds
 for i in ltp/fsstress ltp/fsx ltp/aio-stress src/godown
 do
     ln -s ../$i xfstests/bin
 done
 echo "STRIP xfstests/*"
-find xfstests -mindepth 2 -type f -perm /0111 | xargs $STRIP 2> /dev/null
+find xfstests -mindepth 2 -type f -perm /0111 | xargs $STRIP 2> /dev/null \
+    || true
 echo "TAR xfstests"
 find xfstests blktests -path blktests/.git -prune -o -print0 | \
     LC_ALL=C sort -z | \
-- 
2.29.1

Re: [xfstests-bld PATCH] gen-tarball: add 'set -e'

[Eric Biggers]

On Sun, Nov 01, 2020 at 09:24:50AM -0800, Eric Biggers wrote:
> From: Eric Biggers <ebiggers@google.com>
> 
> The latest master branch of xfstests is missing a Makefile in
> tests/ceph/, which broke xfstests's 'make install'.  But gen-tarball
> didn't notice this.  Fix this by adding 'set -e', and to make this work
> adjust a couple other commands that are expected to fail.
> 
> Signed-off-by: Eric Biggers <ebiggers@google.com>
> ---
>  gen-tarball | 12 +++++++++---
>  1 file changed, 9 insertions(+), 3 deletions(-)
> 

Ping.  Ted, are you planning to apply this?  The master branch of xfstests is
fixed now, but this gen-tarball change would still be good to have.

- Eric

Re: [xfstests-bld PATCH] gen-tarball: add 'set -e'

[Eric Biggers]

On Wed, Nov 11, 2020 at 11:21:52AM -0800, Eric Biggers wrote:
> On Sun, Nov 01, 2020 at 09:24:50AM -0800, Eric Biggers wrote:
> > From: Eric Biggers <ebiggers@google.com>
> > 
> > The latest master branch of xfstests is missing a Makefile in
> > tests/ceph/, which broke xfstests's 'make install'.  But gen-tarball
> > didn't notice this.  Fix this by adding 'set -e', and to make this work
> > adjust a couple other commands that are expected to fail.
> > 
> > Signed-off-by: Eric Biggers <ebiggers@google.com>
> > ---
> >  gen-tarball | 12 +++++++++---
> >  1 file changed, 9 insertions(+), 3 deletions(-)
> > 
> 
> Ping.  Ted, are you planning to apply this?  The master branch of xfstests is
> fixed now, but this gen-tarball change would still be good to have.
> 

Actually, I missed one case where a failure is expected -- the case where
kvm-xfstests/test-appliance/debs doesn't exist.  I'll send v2.

- Eric

[xfstests-bld PATCH v2] gen-tarball: add 'set -e'

[Eric Biggers]

From: Eric Biggers <ebiggers@google.com>

'make install' in xfstests was temporarily broken (it was broken by
commit 10f3f9707cca and fixed by commit 1de2b58b8e29).  gen-tarball
didn't notice this, resulting in test appliances being "successfully"
built but not actually containing all the xfstests files.

Fix gen-tarball to check for errors by adding 'set -e'.  To make this
work, adjust a few commands that are expected to fail.

Signed-off-by: Eric Biggers <ebiggers@google.com>
---

v2: handle case where kvm-xfstests/test-appliance/debs doesn't exist

 gen-tarball | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/gen-tarball b/gen-tarball
index 7d38b95..b8e3307 100755
--- a/gen-tarball
+++ b/gen-tarball
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -e
+
 if test -f config.custom ; then
 	. config.custom
 else
@@ -59,7 +61,11 @@ else
     cp xfstests-dev/README* xfstests
 fi
 echo "xfstests-bld	$(git describe --always --dirty) ($(git log -1 --pretty=%cD))" > xfstests-bld.ver
-debs_vers=$(find kvm-xfstests/test-appliance/debs -name "*.ver" -print 2>/dev/null)
+if test -e kvm-xfstests/test-appliance/debs ; then
+    debs_vers=$(find kvm-xfstests/test-appliance/debs -name "*.ver" -print)
+else
+    debs_vers=
+fi
 cat *.ver $debs_vers | sort > xfstests/git-versions
 if test -f build-distro ; then
     cp build-distro xfstests/build-distro
@@ -72,15 +78,19 @@ if test -d bld/usr/bin ; then
     cp bld/usr/bin/* xfstests/bin
 fi
 cp bld/lib/client.txt xfstests/lib
-cp bld/lib/libimaevm.so.0.0.0 xfstests/lib
-ln -s libimaevm.so.0.0.0 xfstests/lib/libimaevm.so.0
+# ima-evm-utils is optional.
+if test -e bld/lib/libimaevm.so.0.0.0; then
+    cp bld/lib/libimaevm.so.0.0.0 xfstests/lib
+    ln -s libimaevm.so.0.0.0 xfstests/lib/libimaevm.so.0
+fi
 rm -f xfstests/bin/compile_et xfstests/bin/mk_cmds
 for i in ltp/fsstress ltp/fsx ltp/aio-stress src/godown
 do
     ln -s ../$i xfstests/bin
 done
 echo "STRIP xfstests/*"
-find xfstests -mindepth 2 -type f -perm /0111 | xargs $STRIP 2> /dev/null
+find xfstests -mindepth 2 -type f -perm /0111 | xargs $STRIP 2> /dev/null \
+    || true
 echo "TAR xfstests"
 find xfstests blktests -path blktests/.git -prune -o -print0 | \
     LC_ALL=C sort -z | \
-- 
2.29.2

Re: [xfstests-bld PATCH v2] gen-tarball: add 'set -e'

[Theodore Y. Ts'o]

On Wed, Nov 11, 2020 at 01:35:15PM -0800, Eric Biggers wrote:
> From: Eric Biggers <ebiggers@google.com>
> 
> 'make install' in xfstests was temporarily broken (it was broken by
> commit 10f3f9707cca and fixed by commit 1de2b58b8e29).  gen-tarball
> didn't notice this, resulting in test appliances being "successfully"
> built but not actually containing all the xfstests files.
> 
> Fix gen-tarball to check for errors by adding 'set -e'.  To make this
> work, adjust a few commands that are expected to fail.
> 
> Signed-off-by: Eric Biggers <ebiggers@google.com>

Thanks, applied.

						- Ted