From: Colin Walters <walters@verbum.org>
Date: Tue, 27 Jun 2023 10:59:51 +0000 (-0400)
Subject: test-composefs: Sync flow with other tests
X-Git-Tag: archive/raspbian/2023.7-3+rpi1~1^2~9^2~1^2~4^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=aeef8221c430a3b7ae86bfbedc01b82848d4430a;p=ostree.git

test-composefs: Sync flow with other tests

I am not sure why this is failing on older Debian systems,
but I'm wildly guessing that something being done in `libtest.sh`
is setting up automake in a way that we need.  This is done
in other tests.

Or maybe it's the missing `$CMD_PREFIX`?  Let's see...
---

diff --git a/tests/test-composefs.sh b/tests/test-composefs.sh
index f76cbf22..9a14e545 100755
--- a/tests/test-composefs.sh
+++ b/tests/test-composefs.sh
@@ -17,12 +17,13 @@
 
 set -euo pipefail
 
-if ! ostree --version | grep -q -e '- composefs'; then
+. $(dirname $0)/libtest.sh
+
+if ! ${CMD_PREFIX} ostree --version | grep -q -e '- composefs'; then
     echo "1..0 #SKIP no composefs support compiled in"
     exit 0
 fi
 
-. $(dirname $0)/libtest.sh
 
 setup_test_repository "bare-user"