Skip to contentSkip to conversation

gen-tarball: add 'set -e'

PATCH Superseded Eric Biggers 2 participants 5 messages Nov 1, 2020 – Nov 12, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 gen-tarball: add 'set -e'

From: Eric Biggers <[email protected]>

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.

---
 gen-tarball | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)
gen-tarball +9 -3
index 7d38b95..f925b39 100755
@@ -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 | \
Signature · 1 line
2.29.1
#1 lore raw
Quoted 7 lines · Eric Biggers

From: Eric Biggers <[email protected]>

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.

Quoted 5 lines
---
 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

#2 lore raw
Quoted 8 lines · Eric Biggers
Quoted 7 lines · Eric Biggers

From: Eric Biggers <[email protected]>

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.

Quoted 9 lines
Quoted 5 lines
---
 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

#3 lore raw

PATCH v2 1/1 gen-tarball: add 'set -e'

From: Eric Biggers <[email protected]>

'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.

---

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

 gen-tarball | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)
gen-tarball +14 -4
index 7d38b95..b8e3307 100755
@@ -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 | \
Signature · 1 line
2.29.2
#4 lore raw
Quoted 11 lines · Eric Biggers

From: Eric Biggers <[email protected]>

'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.

Thanks, applied.

- Ted