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 a2411c66c291c1ee6a077fb6f1924db91f0a021d..6a214bc34d27d9200a340e9dde3003b25568e2fb 100755 (executable)
--- 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 b59cbfa2c3e00f891aa0bb9e1d82833147dd14fd..55be3948425e6a3bb843b25b848a1583e1e69e01 100755 (executable)
--- 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