diff options
| author | Ruediger Meier | 2014-06-04 00:17:58 +0200 |
|---|---|---|
| committer | Ruediger Meier | 2014-06-04 10:14:24 +0200 |
| commit | 15b2606c4f86dbb73abf41cdecfba7f65fd5bb22 (patch) | |
| tree | d195e146471c5b31f52e5721fed31c4bcf947d4f /tests/ts/libmount | |
| parent | build-sys: fix update-potfiles script (diff) | |
| download | kernel-qcow2-util-linux-15b2606c4f86dbb73abf41cdecfba7f65fd5bb22.tar.gz kernel-qcow2-util-linux-15b2606c4f86dbb73abf41cdecfba7f65fd5bb22.tar.xz kernel-qcow2-util-linux-15b2606c4f86dbb73abf41cdecfba7f65fd5bb22.zip | |
tests: fix python tests for dist and out-of-tree builds
- add python helper scripts to the dist
- helper scripts are always in srcdir
- python libs are in builddir
- abort tests if helpers are missing
Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
Diffstat (limited to 'tests/ts/libmount')
| -rwxr-xr-x | tests/ts/libmount/context-py | 1 | ||||
| -rwxr-xr-x | tests/ts/libmount/context-utab-py | 2 | ||||
| -rwxr-xr-x | tests/ts/libmount/tabfiles-py | 1 | ||||
| -rwxr-xr-x | tests/ts/libmount/tabfiles-tags-py | 2 | ||||
| -rwxr-xr-x | tests/ts/libmount/update-py | 3 |
5 files changed, 7 insertions, 2 deletions
diff --git a/tests/ts/libmount/context-py b/tests/ts/libmount/context-py index e8faa7242..b2355a795 100755 --- a/tests/ts/libmount/context-py +++ b/tests/ts/libmount/context-py @@ -20,6 +20,7 @@ ts_init_py libmount ts_skip_nonroot TESTPROG="$TS_HELPER_PYLIBMOUNT_CONTEXT" +[ -x $TESTPROG ] || ts_die "test script missing" PYDBG="$PYTHON -m pdb" LABEL=libmount-test diff --git a/tests/ts/libmount/context-utab-py b/tests/ts/libmount/context-utab-py index 8f8c37992..00af69554 100755 --- a/tests/ts/libmount/context-utab-py +++ b/tests/ts/libmount/context-utab-py @@ -18,6 +18,8 @@ ts_skip_nonroot TESTPROG="$TS_HELPER_PYLIBMOUNT_CONTEXT" +[ -x $TESTPROG ] || ts_die "test script missing" + LABEL=libmount-test UUID=$($TS_CMD_UUIDGEN) MOUNTPOINT="$TS_MOUNTPOINT" diff --git a/tests/ts/libmount/tabfiles-py b/tests/ts/libmount/tabfiles-py index c5ca1c563..f0c4836d0 100755 --- a/tests/ts/libmount/tabfiles-py +++ b/tests/ts/libmount/tabfiles-py @@ -11,6 +11,7 @@ ts_init_py libmount PYDBG="$PYTHON -m pdb" TESTPROG="$TS_HELPER_PYLIBMOUNT_TAB" +[ -x $TESTPROG ] || ts_die "test script missing" ts_init_subtest "parse-fstab" $PYTHON $TESTPROG --parse "$TS_SELF/files/fstab" &> $TS_OUTPUT diff --git a/tests/ts/libmount/tabfiles-tags-py b/tests/ts/libmount/tabfiles-tags-py index 982cc0001..2f462a0af 100755 --- a/tests/ts/libmount/tabfiles-tags-py +++ b/tests/ts/libmount/tabfiles-tags-py @@ -9,6 +9,8 @@ ts_init_py libmount ts_skip_nonroot TESTPROG="$TS_HELPER_PYLIBMOUNT_TAB" +[ -x $TESTPROG ] || ts_die "test script missing" + ts_check_prog "mkfs.ext3" PYDBG="$PYTHON -m pdb" diff --git a/tests/ts/libmount/update-py b/tests/ts/libmount/update-py index da14b9bae..6493224fb 100755 --- a/tests/ts/libmount/update-py +++ b/tests/ts/libmount/update-py @@ -11,8 +11,7 @@ ts_init_py libmount ts_skip_nonroot TESTPROG="$TS_HELPER_PYLIBMOUNT_UPDATE" - -[ -x $TESTPROG ] || ts_skip "test not compiled" +[ -x $TESTPROG ] || ts_die "test script missing" # # fstab - replace |