From: Kusanagi Kouichi Date: Tue, 3 Dec 2019 12:55:54 +0000 (+0900) Subject: generic/{075,122}: Use $RESULT_DIR instead of $here X-Git-Tag: v2022.05.01~934 X-Git-Url: http://git.apps.os.sepia.ceph.com/?p=xfstests-dev.git;a=commitdiff_plain;h=8acea1c0228d9a3417791ae95c9df024050204cf generic/{075,122}: Use $RESULT_DIR instead of $here If $here is not writable, tests fail. Signed-off-by: Kusanagi Kouichi Reviewed-by: Eryu Guan Signed-off-by: Eryu Guan --- diff --git a/tests/generic/075 b/tests/generic/075 index 923c9e4f..df2087c3 100755 --- a/tests/generic/075 +++ b/tests/generic/075 @@ -55,16 +55,16 @@ _do_test() fi fi - # This cd and use of -P gets full debug on $here (not TEST_DEV) + # This cd and use of -P gets full debug on "$RESULT_DIR" (not TEST_DEV) cd $out - if ! $here/ltp/fsx $_param -P $here $seq.$_n $FSX_AVOID &>/dev/null + if ! $here/ltp/fsx $_param -P "$RESULT_DIR" $seq.$_n $FSX_AVOID &>/dev/null 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 + mv "$RESULT_DIR"/$seq.$_n.fsxlog $seqres.$_n.fsxlog od -xAx $seqres.$_n.full > $seqres.$_n.bad - od -xAx $here/$seq.$_n.fsxgood > $seqres.$_n.good - rm -f $here/$seq.$_n.fsxgood + od -xAx "$RESULT_DIR"/$seq.$_n.fsxgood > $seqres.$_n.good + rm -f "$RESULT_DIR"/$seq.$_n.fsxgood status=1 exit fi diff --git a/tests/generic/112 b/tests/generic/112 index 18d610ee..580c4cd5 100755 --- a/tests/generic/112 +++ b/tests/generic/112 @@ -55,12 +55,12 @@ _do_test() fi fi - # This cd and use of -P gets full debug on $here (not TEST_DEV) + # This cd and use of -P gets full debug on "$RESULT_DIR" (not TEST_DEV) cd $out - if ! $here/ltp/fsx $_param -P $here $FSX_AVOID $seq.$_n &>/dev/null + if ! $here/ltp/fsx $_param -P "$RESULT_DIR" $FSX_AVOID $seq.$_n &>/dev/null then echo " fsx ($_param) returned $? - see $seq.$_n.full" - mv $here/$seq.$_n.fsxlog $seqres.$_n.full + mv "$RESULT_DIR"/$seq.$_n.fsxlog $seqres.$_n.full status=1 exit fi