From: Martin Schwenke <martin@meltin.net>
Date: Wed, 18 Sep 2019 02:25:06 +0000 (+1000)
Subject: ctdb-tests: Move use of show_progress() into ctdb_test_run()
X-Git-Tag: talloc-2.3.1~487
X-Git-Url: http://git.samba.org/?p=samba.git;a=commitdiff_plain;h=47c9b79262ee4101d29c977d98933bfcf22f7426

ctdb-tests: Move use of show_progress() into ctdb_test_run()

This allows more variables to be set in this function because they are
no longer in a sub-shell.

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

diff --git a/ctdb/tests/run_tests.sh b/ctdb/tests/run_tests.sh
index 1d5b7f3318b..a5775ca0814 100755
--- a/ctdb/tests/run_tests.sh
+++ b/ctdb/tests/run_tests.sh
@@ -135,7 +135,8 @@ ctdb_test_run ()
 
 	local status=0
 	if [ -x "$f" ] ; then
-		timeout "$test_time_limit" "$f" || status=$?
+		timeout "$test_time_limit" "$f" | show_progress
+		status=$?
 	else
 		echo "TEST IS NOT EXECUTABLE"
 		status=1
@@ -202,7 +203,7 @@ run_one_test ()
 
     tests_total=$((tests_total + 1))
 
-    ctdb_test_run "$f" | show_progress
+    ctdb_test_run "$f"
     status=$?
     if [ $status -eq 0 ] ; then
 	tests_passed=$((tests_passed + 1))