file locks: don't report failed checkpoint as failure

PATCH New Serge E. Hallyn 1 participant 1 message Feb 15, 2010

lore

Share & tools

lore

Serge E. Hallyn

author

2010-02-15 16:52 UTC #0 lore raw

PATCH 1/1 file locks: don't report failed checkpoint as failure

And report failure if checkpoint succeeds, bc it should not.

Signed-off-by Serge E. Hallyn <serue-r/[email protected]>

---
 fileio/run-fcntltests.sh |   10 +++++++++-
 fileio/runtests.sh       |    3 +++
 2 files changed, 12 insertions(+), 1 deletions(-)

fileio/run-fcntltests.sh +9 -1

index 35be131..2a5f628 100755
@@ -51,8 +51,16 @@ checkpoint()
 	$ECHO "\t- Checkpoint: $CHECKPOINT $pid \> $CHECKPOINT_FILE"
 	$CHECKPOINT $pid > $CHECKPOINT_FILE
 	ret=$?
+	# At the moment we expect failure because checkpoint
+	# of file locks is not supported
 	if [ $ret -ne 0 ]; then
-		$ECHO "***** FAIL: Checkpoint of $pid failed"
+		$ECHO "***** PASS: Checkpoint of $pid failed"
+		ps -efL |grep $TEST_CMD >> $SCRIPT_LOG
+		killall -9 `basename $TEST_CMD`
+		thaw
+		exit 0;
+	else
+		$ECHO "***** FAIL: Checkpoint of $pid did not fail"
 		ps -efL |grep $TEST_CMD >> $SCRIPT_LOG
 		killall -9 `basename $TEST_CMD`
 		thaw

fileio/runtests.sh +3 -0

index b808927..cb633fb 100755
@@ -7,15 +7,18 @@ echo
 
 echo
 echo "****** $0: Running test: filelock1"
+echo "****** (expect FAIL)"
 echo
 ./run-fcntltests.sh filelock1
 
 echo
 echo "****** $0: Running test: filelease1"
+echo "****** (expect FAIL)"
 echo
 ./run-fcntltests.sh filelease1
 
 echo
 echo "****** $0: Running test: fsetown1"
+echo "****** (expect FAIL)"
 echo
 ./run-fcntltests.sh fsetown1

Signature · 1 line

1.6.3.3