From: Eric Biggers <ebiggers@kernel.org>
To: Theodore Ts'o <tytso@mit.edu>
Cc: fstests@vger.kernel.org
Subject: [xfstests-bld PATCH] gen-tarball: add 'set -e'
Date: Sun, 1 Nov 2020 09:24:50 -0800 [thread overview]
Message-ID: <20201101172450.479000-1-ebiggers@kernel.org> (raw)
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
next reply other threads:[~2020-11-01 17:26 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-01 17:24 Eric Biggers [this message]
2020-11-11 19:21 ` [xfstests-bld PATCH] gen-tarball: add 'set -e' Eric Biggers
2020-11-11 21:25 ` Eric Biggers
2020-11-11 21:35 ` [xfstests-bld PATCH v2] " Eric Biggers
2020-11-12 3:51 ` Theodore Y. Ts'o
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201101172450.479000-1-ebiggers@kernel.org \
--to=ebiggers@kernel.org \
--cc=fstests@vger.kernel.org \
--cc=tytso@mit.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.