Skip to contentSkip to conversation

generic/075: no need to move the .fsxlog to the same directory

PATCH In review [email protected] 2 participants 4 messages Mar 1, 2023 – Mar 22, 2023

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 generic/075: no need to move the .fsxlog to the same directory

From: Xiubo Li <[email protected]>

Actually it was trying to move the '075.$_n.fsxlog' from results directory to the same results directory.

---
 tests/generic/075 | 1 -
 1 file changed, 1 deletion(-)
tests/generic/075 +0 -1
index 9f24ad41..03a394a6 100755
@@ -57,7 +57,6 @@ _do_test()
     then
 	echo "    fsx ($_param) failed, $? - compare $seqres.$_n.{good,bad,fsxlog}"
 	mv $out/$seq.$_n $seqres.$_n.full
-	mv "$RESULT_DIR"/$seq.$_n.fsxlog $seqres.$_n.fsxlog
 	od -xAx $seqres.$_n.full > $seqres.$_n.bad
 	od -xAx "$RESULT_DIR"/$seq.$_n.fsxgood > $seqres.$_n.good
 	rm -f "$RESULT_DIR"/$seq.$_n.fsxgood
Signature · 1 line
2.31.1
author
#1 lore raw

Ping.

What's the status of this patch ?

Thanks

- Xiubo

Quoted 23 lines · On 01/03/2023 10:07, [email protected] wrote:

From: Xiubo Li <[email protected]>

Actually it was trying to move the '075.$_n.fsxlog' from results directory to the same results directory.

---
  tests/generic/075 | 1 -
  1 file changed, 1 deletion(-)
tests/generic/075 +0 -1
index 9f24ad41..03a394a6 100755
@@ -57,7 +57,6 @@ _do_test()
      then
  	echo "    fsx ($_param) failed, $? - compare $seqres.$_n.{good,bad,fsxlog}"
  	mv $out/$seq.$_n $seqres.$_n.full
-	mv "$RESULT_DIR"/$seq.$_n.fsxlog $seqres.$_n.fsxlog
  	od -xAx $seqres.$_n.full > $seqres.$_n.bad
  	od -xAx "$RESULT_DIR"/$seq.$_n.fsxgood > $seqres.$_n.good
  	rm -f "$RESULT_DIR"/$seq.$_n.fsxgood
Signature · 6 lines
Best Regards,

Xiubo Li (李秀波)

Email: [email protected]/[email protected]
Slack: @Xiubo Li
#2 lore raw
In reply to [email protected]
Quoted 16 lines · On Wed, Mar 01, 2023 at 10:07:30AM +0800, [email protected] wrote:

From: Xiubo Li <[email protected]>

Actually it was trying to move the '075.$_n.fsxlog' from results directory to the same results directory.

---
 tests/generic/075 | 1 -
 1 file changed, 1 deletion(-)
tests/generic/075 +0 -0
index 9f24ad41..03a394a6 100755

tests/generic/075 _do_test() · line 60

Quoted 4 lines
tests/generic/075 +0 -1
@@ -57,7 +57,6 @@ _do_test()
     then
 	echo "    fsx ($_param) failed, $? - compare $seqres.$_n.{good,bad,fsxlog}"
 	mv $out/$seq.$_n $seqres.$_n.full
-	mv "$RESULT_DIR"/$seq.$_n.fsxlog $seqres.$_n.fsxlog

Hmm... Thoese $seq, $seqnum, $seqres, $RESULT_DIR and $REPORT_DIR are mess for me too :-D

From the logic of xfstests/check:

  if $OPTIONS_HAVE_SECTIONS; then
          export RESULT_DIR=`echo $group | sed -e "s;$SRC_DIR;${RESULT_BASE}/$section;"`
          REPORT_DIR="$RESULT_BASE/$section"
  else
          export RESULT_DIR=`echo $group | sed -e "s;$SRC_DIR;$RESULT_BASE;"`
          REPORT_DIR="$RESULT_BASE"
  fi
  seqres="$REPORT_DIR/$seqnum"

I think "$RESULT_DIR"/$seq equal to "$seqres", so this change makes sense to me. (Not sure if there're some special situations which I don't know :)

The generic/075 is too old, lots of code in it can be removed or refactored, so I think it's not worth changing it bit by bit, I can refactor it totally, or if you'd like, you can do that.

Thanks,
Zorro

Quoted 6 lines
tests/generic/075 +0 -0
 	od -xAx $seqres.$_n.full > $seqres.$_n.bad
 	od -xAx "$RESULT_DIR"/$seq.$_n.fsxgood > $seqres.$_n.good
 	rm -f "$RESULT_DIR"/$seq.$_n.fsxgood
Signature · 1 line
2.31.1
author
#3 lore raw
Quoted 36 lines · Zorro Lang
Quoted 16 lines · On Wed, Mar 01, 2023 at 10:07:30AM +0800, [email protected] wrote:

From: Xiubo Li <[email protected]>

Actually it was trying to move the '075.$_n.fsxlog' from results directory to the same results directory.

---
  tests/generic/075 | 1 -
  1 file changed, 1 deletion(-)
tests/generic/075 +0 -0
index 9f24ad41..03a394a6 100755

tests/generic/075 _do_test() · line 60

Quoted 4 lines
tests/generic/075 +0 -1
@@ -57,7 +57,6 @@ _do_test()
      then
  	echo "    fsx ($_param) failed, $? - compare $seqres.$_n.{good,bad,fsxlog}"
  	mv $out/$seq.$_n $seqres.$_n.full
-	mv "$RESULT_DIR"/$seq.$_n.fsxlog $seqres.$_n.fsxlog

Hmm... Thoese $seq, $seqnum, $seqres, $RESULT_DIR and $REPORT_DIR are mess for me too :-D

From the logic of xfstests/check:

   if $OPTIONS_HAVE_SECTIONS; then
           export RESULT_DIR=`echo $group | sed -e "s;$SRC_DIR;${RESULT_BASE}/$section;"`
           REPORT_DIR="$RESULT_BASE/$section"
   else
           export RESULT_DIR=`echo $group | sed -e "s;$SRC_DIR;$RESULT_BASE;"`
           REPORT_DIR="$RESULT_BASE"
   fi
   seqres="$REPORT_DIR/$seqnum"
Quoted 6 lines

I think "$RESULT_DIR"/$seq equal to "$seqres", so this change makes sense to me. (Not sure if there're some special situations which I don't know :)

The generic/075 is too old, lots of code in it can be removed or refactored, so I think it's not worth changing it bit by bit, I can refactor it totally, or if you'd like, you can do that.

Yeah, I can do that later, but not recently.

I may add some more tests in future and then I can improve this together.

Thanks Zorro,

- Xiubo

Quoted 9 lines

Thanks,
Zorro

Quoted 6 lines
tests/generic/075 +0 -0
  	od -xAx $seqres.$_n.full > $seqres.$_n.bad
  	od -xAx "$RESULT_DIR"/$seq.$_n.fsxgood > $seqres.$_n.good
  	rm -f "$RESULT_DIR"/$seq.$_n.fsxgood
Signature · 1 line
2.31.1
Signature · 6 lines
Best Regards,

Xiubo Li (李秀波)

Email: [email protected]/[email protected]
Slack: @Xiubo Li