ctdb-tests: Simplify ctdb_test_run()
authorMartin Schwenke <martin@meltin.net>
Mon, 9 Sep 2019 10:51:51 +0000 (20:51 +1000)
committerAmitay Isaacs <amitay@samba.org>
Fri, 4 Oct 2019 09:41:28 +0000 (09:41 +0000)
Only the test file name is ever passed.

Reindent while touching many existing lines.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
ctdb/tests/run_tests.sh

index a2c124ed05017941f3da09e7e96a45d0fb9f710c..1d5b7f3318b36afe8725d0f95d304cac66ac8b0f 100755 (executable)
@@ -129,23 +129,21 @@ ctdb_test_end ()
 
 ctdb_test_run ()
 {
-    local name="$1" ; shift
-
-    [ -n "$1" ] || set -- "$name"
+       local f="$1"
 
-    $no_header || ctdb_test_begin "$name"
+       $no_header || ctdb_test_begin "$f"
 
-    local status=0
-    if [ -x "$1" ] ; then
-           timeout "$test_time_limit" "$@" || status=$?
-    else
-           echo "TEST IS NOT EXECUTABLE"
-           status=1
-    fi
+       local status=0
+       if [ -x "$f" ] ; then
+               timeout "$test_time_limit" "$f" || status=$?
+       else
+               echo "TEST IS NOT EXECUTABLE"
+               status=1
+       fi
 
-    $no_header || ctdb_test_end "$name" "$status" "$*"
+       $no_header || ctdb_test_end "$f" "$status"
 
-    return $status
+       return $status
 }
 
 ######################################################################