config-timeout no longer required

Instead, if it's not specified there's a default 10 minute timeout - now
that we can specify per-test timeouts the global timeout isn't as
important.

Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>

10 files changed, 1 insertions, 17 deletions

diff --git a/lib/parse-test.sh b/lib/parse-test.sh
index 2f7f90c..6719cc4 100644
--- a/lib/parse-test.sh
+++ b/lib/parse-test.sh
@@ -169,8 +169,7 @@ parse_test_deps()
     fi
 
     if [ -z "$ktest_timeout" ]; then
-	echo "test must specify config-timeout"
-	exit 1
+	ktest_timeout=6000
     fi
 
     # may be overridden by test:
diff --git a/tests/bcachefs/ec.ktest b/tests/bcachefs/ec.ktest
index 41cbfde..7bf3724 100644
--- a/tests/bcachefs/ec.ktest
+++ b/tests/bcachefs/ec.ktest
@@ -12,8 +12,6 @@ config-scratch-devs 4G
 config-scratch-devs 4G
 config-scratch-devs 4G
 
-config-timeout $(stress_timeout)
-
 test_ec_small()
 {
     set_watchdog 60
diff --git a/tests/bcachefs/perf.ktest b/tests/bcachefs/perf.ktest
index 7d79db6..0ee28c2 100644
--- a/tests/bcachefs/perf.ktest
+++ b/tests/bcachefs/perf.ktest
@@ -16,7 +16,6 @@ t=12
 
 config-mem	    16G
 config-scratch-devs 32G
-config-timeout	    180
 config-cpus	    $t
 
 n=10M
diff --git a/tests/bcachefs/quota.ktest b/tests/bcachefs/quota.ktest
index 9433ec8..261600f 100644
--- a/tests/bcachefs/quota.ktest
+++ b/tests/bcachefs/quota.ktest
@@ -8,8 +8,6 @@ require-kernel-config BCACHEFS_QUOTA
 config-scratch-devs 4G
 config-scratch-devs 4G
 
-config-timeout $(stress_timeout)
-
 require-git http://evilpiepirate.org/git/linuxquota.git
 require-make linuxquota
 
diff --git a/tests/bcachefs/replication.ktest b/tests/bcachefs/replication.ktest
index dabcf06..b0dcc44 100644
--- a/tests/bcachefs/replication.ktest
+++ b/tests/bcachefs/replication.ktest
@@ -14,8 +14,6 @@ config-scratch-devs 4G
 
 config-mem 4G
 
-config-timeout $(stress_timeout)
-
 test_recovery()
 {
     set_watchdog 180
diff --git a/tests/bcachefs/single_device.ktest b/tests/bcachefs/single_device.ktest
index 14b6927..a8d1e18 100644
--- a/tests/bcachefs/single_device.ktest
+++ b/tests/bcachefs/single_device.ktest
@@ -11,8 +11,6 @@ require-kernel-config MD_FAULTY
 config-scratch-devs 4G
 config-scratch-devs 4G
 
-config-timeout $(stress_timeout)
-
 test_stress_ng()
 {
     set_watchdog 60
diff --git a/tests/bcachefs/subvol.ktest b/tests/bcachefs/subvol.ktest
index 76d2cc1..39c8cde 100644
--- a/tests/bcachefs/subvol.ktest
+++ b/tests/bcachefs/subvol.ktest
@@ -5,8 +5,6 @@ require-lib bcachefs-test-libs.sh
 config-scratch-devs 4G
 config-scratch-devs 4G
 
-config-timeout $(stress_timeout)
-
 test_snapshots_simple()
 {
     NR_SNAPS=1
diff --git a/tests/bcachefs/tier.ktest b/tests/bcachefs/tier.ktest
index c8efe77..2449f3d 100644
--- a/tests/bcachefs/tier.ktest
+++ b/tests/bcachefs/tier.ktest
@@ -7,8 +7,6 @@ config-scratch-devs 4G
 config-scratch-devs 16G
 config-scratch-devs 16G
 
-config-timeout $(stress_timeout)
-
 run_basic_tiering_test()
 {
     run_basic_fio_test "$@"			\
diff --git a/tests/bcachefs/units.ktest b/tests/bcachefs/units.ktest
index 872c340..100b2c5 100644
--- a/tests/bcachefs/units.ktest
+++ b/tests/bcachefs/units.ktest
@@ -14,7 +14,6 @@ fi
 
 config-mem	    8G
 config-scratch-devs 8G
-config-timeout	    600
 
 btree_node_size=8k
 
diff --git a/tests/bcachefs/xfstests.ktest b/tests/bcachefs/xfstests.ktest
index eff3b92..13ba8ec 100644
--- a/tests/bcachefs/xfstests.ktest
+++ b/tests/bcachefs/xfstests.ktest
@@ -13,7 +13,6 @@ require-kernel-config BCACHEFS_POSIX_ACL
 require-kernel-config BCACHEFS_QUOTA=y
 require-kernel-config QUOTA
 
-config-mem 4G
 config-cpus 24
 
 run_tests()