generic/{436,445}: define _cleanup function earlier in the tests

If the filesystem doesn't support a feature that is required for the tests
to run, they will fail to execute the _cleanup function because it isn't yet
defined:

  ./common/rc: line 1: _cleanup: command not found

This error became more visible with commit 87a53d2e7c82 ("generic/{436,445}:
check falloc support").

Cc: Amir Goldstein <amir73il@gmail.com>
Signed-off-by: Luis Henriques <lhenriques@suse.com>
Reviewed-by: Eryu Guan <guaneryu@gmail.com>
Signed-off-by: Eryu Guan <guaneryu@gmail.com>

diff --git a/tests/generic/436 b/tests/generic/436
index ada60b2e7afdaa73c4e9cb30435312df58ba3d9c..6e5c36c5c01a946307b92b60102399dd2497c266 100755 (executable)
--- a/tests/generic/436
+++ b/tests/generic/436
@@ -15,6 +15,13 @@ tmp=$$
 status=1       # failure is the default!
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
+BASE_TEST_FILE=$TEST_DIR/seek_sanity_testfile
+
+_cleanup()
+{
+       rm -f $tmp.* $BASE_TEST_FILE.*
+}
+
 # get standard environment, filters and checks
 . ./common/rc
 . ./common/filter
@@ -27,15 +34,8 @@ _require_seek_data_hole
 # All the seek sanity test cases here do falloc
 _require_xfs_io_command "falloc"
 
-BASE_TEST_FILE=$TEST_DIR/seek_sanity_testfile
-
 _require_test_program "seek_sanity_test"
 
-_cleanup()
-{
-       rm -f $tmp.* $BASE_TEST_FILE.*
-}
-
 _run_seek_sanity_test -s 13 -e 16 $BASE_TEST_FILE > $seqres.full 2>&1 ||
        _fail "seek sanity check failed!"
 

diff --git a/tests/generic/445 b/tests/generic/445
index 248f321b86013de08ef9c4ab97c0e38135e7e86a..cf41607997e935d60a8b22aaf9b524d826aee5b3 100755 (executable)
--- a/tests/generic/445
+++ b/tests/generic/445
@@ -15,6 +15,13 @@ tmp=$$
 status=1       # failure is the default!
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
+BASE_TEST_FILE=$TEST_DIR/seek_sanity_testfile
+
+_cleanup()
+{
+       rm -f $tmp.* $BASE_TEST_FILE.*
+}
+
 # get standard environment, filters and checks
 . ./common/rc
 . ./common/filter
@@ -27,15 +34,8 @@ _require_seek_data_hole
 # All the seek sanity test cases here do falloc
 _require_xfs_io_command "falloc"
 
-BASE_TEST_FILE=$TEST_DIR/seek_sanity_testfile
-
 _require_test_program "seek_sanity_test"
 
-_cleanup()
-{
-       rm -f $tmp.* $BASE_TEST_FILE.*
-}
-
 _run_seek_sanity_test -s 17 -e 17 $BASE_TEST_FILE > $seqres.full 2>&1 ||
        _fail "seek sanity check failed!"