generic/{075,112}: fix printing the incorrect return value of fsx
PATCH 1/1 generic/{075,112}: fix printing the incorrect return value of fsx
From: Xiubo Li <[email protected]>
We need to save the result of the 'fsx' temporarily.
--- tests/generic/075 | 6 ++++-- tests/generic/112 | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-)
tests/generic/075 +4 -2
@@ -53,9 +53,11 @@ _do_test() # This cd and use of -P gets full debug on "$RESULT_DIR" (not TEST_DEV) cd $out - if ! $here/ltp/fsx $_param -P "$RESULT_DIR" $seq.$_n $FSX_AVOID &>/dev/null + $here/ltp/fsx $_param -P "$RESULT_DIR" $seq.$_n $FSX_AVOID &>/dev/null + local res=$? + if [ $res -ne 0 ] then - echo " fsx ($_param) failed, $? - compare $seqres.$_n.{good,bad,fsxlog}" + echo " fsx ($_param) failed, $res - compare $seqres.$_n.{good,bad,fsxlog}" mv $out/$seq.$_n $seqres.$_n.full od -xAx $seqres.$_n.full > $seqres.$_n.bad od -xAx "$RESULT_DIR"/$seq.$_n.fsxgood > $seqres.$_n.good
tests/generic/112 +4 -2
@@ -53,9 +53,11 @@ _do_test() # This cd and use of -P gets full debug on "$RESULT_DIR" (not TEST_DEV) cd $out - if ! $here/ltp/fsx $_param -P "$RESULT_DIR" $FSX_AVOID $seq.$_n &>/dev/null + $here/ltp/fsx $_param -P "$RESULT_DIR" $FSX_AVOID $seq.$_n &>/dev/null + local res=$? + if [ $res -ne 0 ] then - echo " fsx ($_param) returned $? - see $seq.$_n.full" + echo " fsx ($_param) returned $res - see $seq.$_n.full" mv "$RESULT_DIR"/$seq.$_n.fsxlog $seqres.$_n.full status=1 exit
Signature · 1 line
2.31.1
Quoted 16 lines · On Wed, Mar 01, 2023 at 11:06:20AM +0800, [email protected] wrote:
From: Xiubo Li <[email protected]>
We need to save the result of the 'fsx' temporarily.
Signed-off-by Xiubo Li <[email protected]>--- tests/generic/075 | 6 ++++-- tests/generic/112 | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-)tests/generic/075 +0
-0
tests/generic/075 _do_test() · line 60
Quoted 10 lines
tests/generic/075 +4
-2@@ -53,9 +53,11 @@ _do_test() # This cd and use of -P gets full debug on "$RESULT_DIR" (not TEST_DEV) cd $out - if ! $here/ltp/fsx $_param -P "$RESULT_DIR" $seq.$_n $FSX_AVOID &>/dev/null + $here/ltp/fsx $_param -P "$RESULT_DIR" $seq.$_n $FSX_AVOID &>/dev/null + local res=$? + if [ $res -ne 0 ] then - echo " fsx ($_param) failed, $? - compare $seqres.$_n.{good,bad,fsxlog}" + echo " fsx ($_param) failed, $res - compare $seqres.$_n.{good,bad,fsxlog}"
Heh, oops.
--D
Quoted 24 lines
tests/generic/075 +0
-0mv $out/$seq.$_n $seqres.$_n.full od -xAx $seqres.$_n.full > $seqres.$_n.bad od -xAx "$RESULT_DIR"/$seq.$_n.fsxgood > $seqres.$_n.goodtests/generic/112 +4
-2@@ -53,9 +53,11 @@ _do_test() # This cd and use of -P gets full debug on "$RESULT_DIR" (not TEST_DEV) cd $out - if ! $here/ltp/fsx $_param -P "$RESULT_DIR" $FSX_AVOID $seq.$_n &>/dev/null + $here/ltp/fsx $_param -P "$RESULT_DIR" $FSX_AVOID $seq.$_n &>/dev/null + local res=$? + if [ $res -ne 0 ] then - echo " fsx ($_param) returned $? - see $seq.$_n.full" + echo " fsx ($_param) returned $res - see $seq.$_n.full" mv "$RESULT_DIR"/$seq.$_n.fsxlog $seqres.$_n.full status=1 exitSignature · 1 line
2.31.1
Quoted 7 lines · On Wed, Mar 01, 2023 at 11:06:20AM +0800, [email protected] wrote:
From: Xiubo Li <[email protected]>
We need to save the result of the 'fsx' temporarily.
Signed-off-by Xiubo Li <[email protected]>---
Hmm... how did you generate this patch? Did you change something before you send this patch out? I can't merge it simply, always got below errors [1] [2]. May you help to generate this patch again purely?
(Of course you can keep the RVB of Darrick)
Thanks,
Zorro
[1]
$ git am ./20230301_xiubli_generic_075_112_fix_printing_the_incorrect_return_value_of_fsx.mbx
Applying: generic/{075,112}: fix printing the incorrect return value of fsx
error: patch failed: tests/generic/075:53
error: tests/generic/075: patch does not apply
Patch failed at 0001 generic/{075,112}: fix printing the incorrect return value of fsx
hint: Use 'git am --show-current-patch=diff' to see the failed patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".[2]
$ git am -3 ./20230301_xiubli_generic_075_112_fix_printing_the_incorrect_return_value_of_fsx.mbx
Applying: generic/{075,112}: fix printing the incorrect return value of fsx
error: sha1 information is lacking or useless (tests/generic/075).
error: could not build fake ancestor
Patch failed at 0001 generic/{075,112}: fix printing the incorrect return value of fsx
hint: Use 'git am --show-current-patch=diff' to see the failed patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".Quoted 43 lines
tests/generic/075 | 6 ++++-- tests/generic/112 | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-)tests/generic/075 +4
-2@@ -53,9 +53,11 @@ _do_test() # This cd and use of -P gets full debug on "$RESULT_DIR" (not TEST_DEV) cd $out - if ! $here/ltp/fsx $_param -P "$RESULT_DIR" $seq.$_n $FSX_AVOID &>/dev/null + $here/ltp/fsx $_param -P "$RESULT_DIR" $seq.$_n $FSX_AVOID &>/dev/null + local res=$? + if [ $res -ne 0 ] then - echo " fsx ($_param) failed, $? - compare $seqres.$_n.{good,bad,fsxlog}" + echo " fsx ($_param) failed, $res - compare $seqres.$_n.{good,bad,fsxlog}" mv $out/$seq.$_n $seqres.$_n.full od -xAx $seqres.$_n.full > $seqres.$_n.bad od -xAx "$RESULT_DIR"/$seq.$_n.fsxgood > $seqres.$_n.goodtests/generic/112 +4
-2@@ -53,9 +53,11 @@ _do_test() # This cd and use of -P gets full debug on "$RESULT_DIR" (not TEST_DEV) cd $out - if ! $here/ltp/fsx $_param -P "$RESULT_DIR" $FSX_AVOID $seq.$_n &>/dev/null + $here/ltp/fsx $_param -P "$RESULT_DIR" $FSX_AVOID $seq.$_n &>/dev/null + local res=$? + if [ $res -ne 0 ] then - echo " fsx ($_param) returned $? - see $seq.$_n.full" + echo " fsx ($_param) returned $res - see $seq.$_n.full" mv "$RESULT_DIR"/$seq.$_n.fsxlog $seqres.$_n.full status=1 exitSignature · 1 line
2.31.1
Quoted 11 lines · Zorro Lang
Quoted 7 lines · On Wed, Mar 01, 2023 at 11:06:20AM +0800, [email protected] wrote:
From: Xiubo Li <[email protected]>
We need to save the result of the 'fsx' temporarily.
Signed-off-by Xiubo Li <[email protected]>---
Hmm... how did you generate this patch? Did you change something before you send this patch out? I can't merge it simply, always got below errors [1] [2]. May you help to generate this patch again purely?
Hi Zorro,
Sorry I missed this.
Actually this will depend on the previous patch:
"generic/075: no need to move the .fsxlog to the same directory"
I forgot to mention that.
Thanks
- Xiubo
Quoted 70 lines
(Of course you can keep the RVB of Darrick)
Thanks,
Zorro[1]
$ git am ./20230301_xiubli_generic_075_112_fix_printing_the_incorrect_return_value_of_fsx.mbx Applying: generic/{075,112}: fix printing the incorrect return value of fsx error: patch failed: tests/generic/075:53 error: tests/generic/075: patch does not apply Patch failed at 0001 generic/{075,112}: fix printing the incorrect return value of fsx hint: Use 'git am --show-current-patch=diff' to see the failed patch When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort".[2]
$ git am -3 ./20230301_xiubli_generic_075_112_fix_printing_the_incorrect_return_value_of_fsx.mbx Applying: generic/{075,112}: fix printing the incorrect return value of fsx error: sha1 information is lacking or useless (tests/generic/075). error: could not build fake ancestor Patch failed at 0001 generic/{075,112}: fix printing the incorrect return value of fsx hint: Use 'git am --show-current-patch=diff' to see the failed patch When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort".Quoted 43 lines
tests/generic/075 | 6 ++++-- tests/generic/112 | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-)tests/generic/075 +4
-2@@ -53,9 +53,11 @@ _do_test() # This cd and use of -P gets full debug on "$RESULT_DIR" (not TEST_DEV) cd $out - if ! $here/ltp/fsx $_param -P "$RESULT_DIR" $seq.$_n $FSX_AVOID &>/dev/null + $here/ltp/fsx $_param -P "$RESULT_DIR" $seq.$_n $FSX_AVOID &>/dev/null + local res=$? + if [ $res -ne 0 ] then - echo " fsx ($_param) failed, $? - compare $seqres.$_n.{good,bad,fsxlog}" + echo " fsx ($_param) failed, $res - compare $seqres.$_n.{good,bad,fsxlog}" mv $out/$seq.$_n $seqres.$_n.full od -xAx $seqres.$_n.full > $seqres.$_n.bad od -xAx "$RESULT_DIR"/$seq.$_n.fsxgood > $seqres.$_n.goodtests/generic/112 +4
-2@@ -53,9 +53,11 @@ _do_test() # This cd and use of -P gets full debug on "$RESULT_DIR" (not TEST_DEV) cd $out - if ! $here/ltp/fsx $_param -P "$RESULT_DIR" $FSX_AVOID $seq.$_n &>/dev/null + $here/ltp/fsx $_param -P "$RESULT_DIR" $FSX_AVOID $seq.$_n &>/dev/null + local res=$? + if [ $res -ne 0 ] then - echo " fsx ($_param) returned $? - see $seq.$_n.full" + echo " fsx ($_param) returned $res - see $seq.$_n.full" mv "$RESULT_DIR"/$seq.$_n.fsxlog $seqres.$_n.full status=1 exitSignature · 1 line
2.31.1
Signature · 6 lines
Best Regards, Xiubo Li (李秀波) Email: [email protected]/[email protected] Slack: @Xiubo Li