[Devel] [PATCH 07/11] cr_tests: Compress more of the error handling code using trap.

[Matt Helsley]

Signed-off-by: Matt Helsley <matthltc at us.ibm.com>
Cc: containers at lists.linux-foundation.org
---
 futex/run.sh |   29 ++++++++++++++++-------------
 1 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/futex/run.sh b/futex/run.sh
index 434a844..5587520 100755
--- a/futex/run.sh
+++ b/futex/run.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-#set -e
+set -e
 
 source ../common.sh
 
@@ -80,23 +80,24 @@ while [ $CURTEST -lt $NUMTESTS ]; do
 		echo "BROK: Futex snafu, re-running this test"
 		continue
 	fi
-	if [ $retval -ne 0 ]; then
-		echo FAIL
-		exit 1
-	else
-		echo PASS
-	fi
+	err_msg="FAIL"
+	[ $retval -eq 0 ]
+	err_msg="BROK"
+	echo PASS
 
 	# now try restarting
+	err_msg="FAIL"
+	# We need to pass -p to mktree since futexes often store the
+	# pid of the task that owns the futex in the futex, even in
+	# the uncontended cases where the kernel is entirely unaware
+	# of the futex. --copy-status ensures that we trap on error.
 	${MKTREE} -p --copy-status < checkpoint-${T}
 	retval=$?
+	err_msg="BROK"
 	echo "Restart of test ${T} done, returned $retval"
-	if [ $retval -ne 0 ]; then
-		echo FAIL
-		exit 1
-	else
-		echo PASS
-	fi
+	err_msg="FAIL"
+	[ $retval -eq 0 ];
+	echo PASS
 	trap '' ERR EXIT
 	CURTEST=$((CURTEST+1))
 done
@@ -106,3 +107,5 @@ trap '' ERR EXIT
 
 # rmdir /cg/1
 # umount /cg
+
+exit ${failed}
-- 
1.5.6.3


_______________________________________________
Containers mailing list
Containers at lists.linux-foundation.org
https://lists.linux-foundation.org/mailman/listinfo/containers