From: Eric Biggers <ebiggers@xxxxxxxxxx>
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@xxxxxxxxxx>
---
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
