From: Eric Sandeen <sandeen@redhat.com>
Date: Tue, 19 Jul 2016 19:53:25 +0000 (-0700)
Subject: generic/075,112: fix up fsx error handling
X-Git-Tag: v2022.05.01~2424
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=cf94bc86334766a0fb98465375c8a626d4bb0a6b;p=users%2Fhch%2Fxfstests-dev.git

generic/075,112: fix up fsx error handling

When fsx fails we try to copy failure state to the results/
dir, but in some cases we are using $seqres instead of
$seq or $seq instead of $here/$seq; fix this up so the
failure state is accurately captured in the results/ dir.

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Reviewed-by: Eryu Guan <eguan@redhat.com>
Signed-off-by: Eryu Guan <eguan@redhat.com>
---

diff --git a/tests/generic/075 b/tests/generic/075
index a2411c66c..6a214bc34 100755
--- a/tests/generic/075
+++ b/tests/generic/075
@@ -79,8 +79,10 @@ _do_test()
     then
 	echo "    fsx ($_param) failed, $? - compare $seqres.$_n.{good,bad,fsxlog}"
 	mv $out/$seq.$_n $seqres.$_n.full
+	mv $here/$seq.$_n.fsxlog $seqres.$_n.fsxlog
 	od -xAx $seqres.$_n.full > $seqres.$_n.bad
-	od -xAx $seqres.$_n.fsxgood > $seqres.$_n.good
+	od -xAx $here/$seq.$_n.fsxgood > $seqres.$_n.good
+	rm -f $here/$seq.$_n.fsxgood
 	status=1
 	exit
     fi
diff --git a/tests/generic/112 b/tests/generic/112
index b59cbfa2c..55be39484 100755
--- a/tests/generic/112
+++ b/tests/generic/112
@@ -78,7 +78,7 @@ _do_test()
     if ! $here/ltp/fsx $_param -P $here $FSX_AVOID $seq.$_n &>/dev/null
     then
 	echo "    fsx ($_param) returned $? - see $seq.$_n.full"
-	mv $seq.$_n.fsxlog $seqres.$_n.full
+	mv $here/$seq.$_n.fsxlog $seqres.$_n.full
 	status=1
 	exit
     fi