diff options
| author | Ruediger Meier | 2014-05-11 23:58:53 +0200 |
|---|---|---|
| committer | Ruediger Meier | 2014-05-13 17:38:45 +0200 |
| commit | 0eb90ba26480b8f64e1ce7f0643de2906bc19204 (patch) | |
| tree | fa264f75172a5e98ecfcceff1842bd0c57296c3a /tests | |
| parent | tests, don't write TS_DEVICE to stdout anymore (diff) | |
| download | kernel-qcow2-util-linux-0eb90ba26480b8f64e1ce7f0643de2906bc19204.tar.gz kernel-qcow2-util-linux-0eb90ba26480b8f64e1ce7f0643de2906bc19204.tar.xz kernel-qcow2-util-linux-0eb90ba26480b8f64e1ce7f0643de2906bc19204.zip | |
tests: introduce TS_CMD_UUIDGEN (never use installed one)
Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/commands.sh | 1 | ||||
| -rwxr-xr-x | tests/ts/libmount/context | 4 | ||||
| -rwxr-xr-x | tests/ts/libmount/context-py | 3 | ||||
| -rwxr-xr-x | tests/ts/libmount/context-utab | 3 | ||||
| -rwxr-xr-x | tests/ts/libmount/context-utab-py | 3 |
5 files changed, 10 insertions, 4 deletions
diff --git a/tests/commands.sh b/tests/commands.sh index 4b5a7d96d..ffc541b3c 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 8267b135d..0cc21ec77 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 78994008a..14bde41f7 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 2c4e30ccf..c7b94a5bb 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 d2168a75c..e03332b37 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 |