diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2013-04-22 20:39:40 -0400 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2013-04-24 00:25:04 -0400 |
| commit | fff87a35d9e26c0d4ea41273a963c0eb20e18da4 (patch) | |
| tree | 72433983d5b6d9070f94c34160dde665ab92abf8 | |
| parent | 0ee679580e55b4b7fe6c68bf63d953017c489617 (diff) | |
| download | systemd-fff87a35d9e26c0d4ea41273a963c0eb20e18da4.tar.gz systemd-fff87a35d9e26c0d4ea41273a963c0eb20e18da4.tar.bz2 systemd-fff87a35d9e26c0d4ea41273a963c0eb20e18da4.zip | |
test: make it easier to override kernel version
| -rw-r--r-- | TODO | 6 | ||||
| -rwxr-xr-x | test/TEST-01-BASIC/test.sh | 4 | ||||
| -rwxr-xr-x | test/TEST-02-CRYPTSETUP/test.sh | 4 | ||||
| -rwxr-xr-x | test/TEST-03-JOBS/test.sh | 4 |
4 files changed, 7 insertions, 11 deletions
@@ -72,8 +72,10 @@ Features: * explicitly disallow changing the cgroup path of units in the name=systemd hierarchy, unless it is outside of /system -* add 'set -e' to scripts in test/ -* make test in test/ work with separate output dir +* test/: + - add 'set -e' to scripts in test/ + - make stuff in test/ work with separate output dir + - remove all the duplicated code in test/ * suppress log output on shutdown when "quiet" is used diff --git a/test/TEST-01-BASIC/test.sh b/test/TEST-01-BASIC/test.sh index 90492079e4..e41ed9dcfe 100755 --- a/test/TEST-01-BASIC/test.sh +++ b/test/TEST-01-BASIC/test.sh @@ -3,8 +3,7 @@ # ex: ts=8 sw=4 sts=4 et filetype=sh TEST_DESCRIPTION="Basic systemd setup" -KVERSION=${KVERSION-$(uname -r)} -KERNEL_VER=$(uname -r) +. $TEST_BASE_DIR/test-functions # Uncomment this to debug failures #DEBUGFAIL="systemd.unit=multi-user.target" @@ -242,5 +241,4 @@ test_cleanup() { return 0 } -. $TEST_BASE_DIR/test-functions do_test "$@" diff --git a/test/TEST-02-CRYPTSETUP/test.sh b/test/TEST-02-CRYPTSETUP/test.sh index e0945313f8..ec714301c6 100755 --- a/test/TEST-02-CRYPTSETUP/test.sh +++ b/test/TEST-02-CRYPTSETUP/test.sh @@ -3,8 +3,7 @@ # ex: ts=8 sw=4 sts=4 et filetype=sh TEST_DESCRIPTION="cryptsetup systemd setup" -KVERSION=${KVERSION-$(uname -r)} -KERNEL_VER=$(uname -r) +. $TEST_BASE_DIR/test-functions # Uncomment this to debug failures #DEBUGFAIL="systemd.unit=multi-user.target" @@ -254,5 +253,4 @@ test_cleanup() { return 0 } -. $TEST_BASE_DIR/test-functions do_test "$@" diff --git a/test/TEST-03-JOBS/test.sh b/test/TEST-03-JOBS/test.sh index 6eaba72e57..6440d1f54b 100755 --- a/test/TEST-03-JOBS/test.sh +++ b/test/TEST-03-JOBS/test.sh @@ -3,8 +3,7 @@ # ex: ts=8 sw=4 sts=4 et filetype=sh TEST_DESCRIPTION="Job-related tests" -KVERSION=${KVERSION-$(uname -r)} -KERNEL_VER=$(uname -r) +. $TEST_BASE_DIR/test-functions # Uncomment this to debug failures #DEBUGFAIL="systemd.unit=multi-user.target" @@ -247,5 +246,4 @@ test_cleanup() { return 0 } -. $TEST_BASE_DIR/test-functions do_test "$@" |