From: Ruediger Meier <ruediger.meier@ga-group.nl>
Date: Sun, 11 May 2014 21:58:53 +0000 (+0200)
Subject: tests: introduce TS_CMD_UUIDGEN (never use installed one)
X-Git-Tag: v2.25-rc1~154^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0eb90ba26480b8f64e1ce7f0643de2906bc19204;p=thirdparty%2Futil-linux.git

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 4b5a7d96d9..ffc541b3cd 100644
--- 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 8267b135d0..0cc21ec775 100755
--- 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 78994008a7..14bde41f7e 100755
--- 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 2c4e30ccfe..c7b94a5bb0 100755
--- 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 d2168a75c2..e03332b37d 100755
--- 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