diff mbox series

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

Message ID 20201111213515.320012-1-ebiggers@kernel.org (mailing list archive)
State New, archived
Headers show
Series [xfstests-bld,v2] gen-tarball: add 'set -e' | expand

Commit Message

Eric Biggers Nov. 11, 2020, 9:35 p.m. UTC
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(-)

Comments

Theodore Ts'o Nov. 12, 2020, 3:51 a.m. UTC | #1
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
diff mbox series

Patch

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 | \