test: make it easier to override kernel version

diff --git a/TODO b/TODO
index fe27d2b2a0b1dbf8e46a0ea22187b58121cb6bf1..aa2c1cea9493a1640f198b79191299ab288208e5 100644 (file)
--- a/TODO
+++ b/TODO
@@ -72,8 +72,10 @@ Features:
 * explicitly disallow changing the cgroup path of units in the
   name=systemd hierarchy, unless it is outside of /system
 
 * 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
 
 
 * 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 90492079e4f5fa7d7300a3bc942c9f59d3bfebb8..e41ed9dcfe8c4d089b9855863396ad596dbd83f2 100755 (executable)
--- 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"
 
 # 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"
 
 # Uncomment this to debug failures
 #DEBUGFAIL="systemd.unit=multi-user.target"


@@ -242,5 +241,4 @@ test_cleanup() {
     return 0
 }
 
     return 0
 }
 

-. $TEST_BASE_DIR/test-functions

 do_test "$@"
 do_test "$@"

diff --git a/test/TEST-02-CRYPTSETUP/test.sh b/test/TEST-02-CRYPTSETUP/test.sh
index e0945313f87f79b5954c50ccef288495fb1943c0..ec714301c69dfc66c8b54798865e241cfd27ecbc 100755 (executable)
--- 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"
 
 # 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"
 
 # Uncomment this to debug failures
 #DEBUGFAIL="systemd.unit=multi-user.target"


@@ -254,5 +253,4 @@ test_cleanup() {
     return 0
 }
 
     return 0
 }
 

-. $TEST_BASE_DIR/test-functions

 do_test "$@"
 do_test "$@"

diff --git a/test/TEST-03-JOBS/test.sh b/test/TEST-03-JOBS/test.sh
index 6eaba72e576a53c56915705cf41057351bea2734..6440d1f54b00f502aee9ffa7e9e6cc2d0bd4ff3c 100755 (executable)
--- 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"
 
 # 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"
 
 # Uncomment this to debug failures
 #DEBUGFAIL="systemd.unit=multi-user.target"


@@ -247,5 +246,4 @@ test_cleanup() {
     return 0
 }
 
     return 0
 }
 

-. $TEST_BASE_DIR/test-functions

 do_test "$@"
 do_test "$@"