tests: introduce TS_CMD_UUIDGEN (never use installed one)

Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>

diff --git a/tests/commands.sh b/tests/commands.sh
index 4b5a7d96d9d7009b375459efa24bfa2db0a36216..ffc541b3cd06d506f4a557bec1829b22b94d7e82 100644 (file)
--- a/tests/commands.sh
+++ b/tests/commands.sh
@@ -73,5 +73,6 @@ TS_CMD_TAILF=${TS_CMD_TAILF-"$top_builddir/tailf"}
 TS_CMD_UL=${TS_CMD_UL-"$top_builddir/ul"}
 TS_CMD_UMOUNT=${TS_CMD_UMOUNT:-"$top_builddir/umount"}
 TS_CMD_UTMPDUMP=${TS_CMD_UTMPDUMP-"$top_builddir/utmpdump"}
+TS_CMD_UUIDGEN=${TS_CMD_UUIDGEN-"$top_builddir/uuidgen"}
 TS_CMD_WHEREIS=${TS_CMD_WHEREIS-"$top_builddir/whereis"}
 TS_CMD_WIPEFS=${TS_CMD_WIPEFS-"$top_builddir/wipefs"}

diff --git a/tests/ts/libmount/context b/tests/ts/libmount/context
index 8267b135d02a04a9d20ccf2fb0d50b956ca6a8f1..0cc21ec7754e91e3cbd11676a43df00e89130f2f 100755 (executable)
--- a/tests/ts/libmount/context
+++ b/tests/ts/libmount/context
@@ -12,11 +12,13 @@ ts_check_test_command "$TS_CMD_FDISK"
 ts_check_test_command "$TS_CMD_FINDMNT"
 ts_check_test_command "$TS_CMD_MOUNT"
 ts_check_test_command "$TS_CMD_UMOUNT"
+ts_check_test_command "$TS_CMD_UUIDGEN"
 
 ts_skip_nonroot
 TESTPROG="$TS_HELPER_LIBMOUNT_CONTEXT"
 LABEL=libmount-test
-UUID=$(uuidgen)
+UUID=$($TS_CMD_UUIDGEN)
+
 MOUNTPOINT="$TS_MOUNTPOINT"
 TS_NOEXIST="$TS_OUTDIR/${TS_TESTNAME}-${TS_SUBNAME}-noex"
 [ -d $TS_NOEXIST ] && rmdir $TS_NOEXIST

diff --git a/tests/ts/libmount/context-py b/tests/ts/libmount/context-py
index 78994008a779df9dc597b3258aad08f25217f43a..14bde41f7e3645818384664c0ebcdd1cba1be0d4 100755 (executable)
--- a/tests/ts/libmount/context-py
+++ b/tests/ts/libmount/context-py
@@ -12,6 +12,7 @@ ts_check_test_command "$TS_CMD_FDISK"
 ts_check_test_command "$TS_CMD_FINDMNT"
 ts_check_test_command "$TS_CMD_MOUNT"
 ts_check_test_command "$TS_CMD_UMOUNT"
+ts_check_test_command "$TS_CMD_UUIDGEN"
 
 ts_init_py libmount
 ts_skip_nonroot
@@ -20,7 +21,7 @@ TESTPROG="$TS_HELPER_PYLIBMOUNT_CONTEXT"
 
 PYDBG="$PYTHON -m pdb"
 LABEL=libmount-test
-UUID=$(uuidgen)
+UUID=$($TS_CMD_UUIDGEN)
 MOUNTPOINT="$TS_MOUNTPOINT"
 TS_NOEXIST="$TS_OUTDIR/${TS_TESTNAME}-${TS_SUBNAME}-noex"
 [ -d $TS_NOEXIST ] && rmdir $TS_NOEXIST

diff --git a/tests/ts/libmount/context-utab b/tests/ts/libmount/context-utab
index 2c4e30ccfe93f8b86cc8d3c611d58591dae15994..c7b94a5bb004ddfb9ceffe1454efe223e5543fa1 100755 (executable)
--- a/tests/ts/libmount/context-utab
+++ b/tests/ts/libmount/context-utab
@@ -11,11 +11,12 @@ ts_init "$*"
 ts_check_test_command "$TS_CMD_FDISK"
 ts_check_test_command "$TS_CMD_FINDMNT"
 ts_check_test_command "$TS_CMD_WIPEFS"
+ts_check_test_command "$TS_CMD_UUIDGEN"
 ts_skip_nonroot
 
 TESTPROG="$TS_HELPER_LIBMOUNT_CONTEXT"
 LABEL=libmount-test
-UUID=$(uuidgen)
+UUID=$($TS_CMD_UUIDGEN)
 MOUNTPOINT="$TS_MOUNTPOINT"
 
 [ -x $TESTPROG ] || ts_skip "test not compiled"

diff --git a/tests/ts/libmount/context-utab-py b/tests/ts/libmount/context-utab-py
index d2168a75c2dceb550a6923daf0a4c1a2d68642f5..e03332b37dc2aab6e610dad0f2e88dd58db5d743 100755 (executable)
--- a/tests/ts/libmount/context-utab-py
+++ b/tests/ts/libmount/context-utab-py
@@ -10,6 +10,7 @@ ts_init "$*"
 ts_check_test_command "$TS_CMD_FDISK"
 ts_check_test_command "$TS_CMD_FINDMNT"
 ts_check_test_command "$TS_CMD_WIPEFS"
+ts_check_test_command "$TS_CMD_UUIDGEN"
 
 ts_init_py libmount
 ts_skip_nonroot
@@ -17,7 +18,7 @@ ts_skip_nonroot
 
 TESTPROG="$TS_HELPER_PYLIBMOUNT_CONTEXT"
 LABEL=libmount-test
-UUID=$(uuidgen)
+UUID=$($TS_CMD_UUIDGEN)
 MOUNTPOINT="$TS_MOUNTPOINT"
 
 # set global variable TS_DEVICE