summaryrefslogtreecommitdiffstats
path: root/tests/ts/partx
diff options
context:
space:
mode:
authorRuediger Meier2015-12-10 16:56:11 +0100
committerRuediger Meier2015-12-10 19:05:25 +0100
commitee6c0ca65b36f4925f58d787276786252532be6f (patch)
tree6c0eab369c26ac473c1004d9f54b64d3f4935de7 /tests/ts/partx
parenttests: skip automake's empty "Testsuite summary" (diff)
downloadkernel-qcow2-util-linux-ee6c0ca65b36f4925f58d787276786252532be6f.tar.gz
kernel-qcow2-util-linux-ee6c0ca65b36f4925f58d787276786252532be6f.tar.xz
kernel-qcow2-util-linux-ee6c0ca65b36f4925f58d787276786252532be6f.zip
tests: skip nonroot before checking for progs in PATH
The least annoying and most useful order is this one: 1. check for compiled UL commands 2. check for root 3. check for loop support 4. check for external progs Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
Diffstat (limited to 'tests/ts/partx')
-rwxr-xr-xtests/ts/partx/partx3
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/ts/partx/partx b/tests/ts/partx/partx
index 91bab4f18..37990d8be 100755
--- a/tests/ts/partx/partx
+++ b/tests/ts/partx/partx
@@ -22,8 +22,6 @@ TS_IMGDIR="$TS_TOPDIR/ts/blkid/images-pt"
PARTS=3
. $TS_TOPDIR/functions.sh
-ts_check_prog "xz"
-
ts_init "$*"
ts_check_test_command "$TS_CMD_PARTX"
@@ -31,6 +29,7 @@ ts_check_test_command "$TS_CMD_ADDPART"
ts_check_test_command "$TS_CMD_DELPART"
ts_skip_nonroot
+ts_check_prog "xz"
mkdir -p $TS_OUTDIR/images-pt
for img in $(ls $TS_IMGDIR/*.img.xz | sort); do