Skip to contentSkip to conversation

xfstests: fix common rc file path in new

PATCH In review Eryu Guan 3 participants 4 messages Mar 28, 2013 – Mar 29, 2013

lore
Share & tools
lore

Eryu Guan

author
#0 lore raw

PATCH 1/1 xfstests: fix common rc file path in new

After the re-factor common.rc has been renamed to common/rc, fix the path in script new, otherwise ./new reports

./new: line 26: ./common.rc: No such file or directory Building include
Building lib
Building ltp
Building src
Building m4
./new: line 70: BEGIN{printf "%03d\n",+1}: command not found Next test is
Error: test already exists!

---
After applying this patch, ./new generates new test starting from 001, so we have to maintain the seq number manually? Do we need an updated version of new? eg. takes an argument to specify the test type like

./new generic

and generates new test based on existing seq number in generic dir.

 new | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
new +1 -1
index 94638f6..b21e75b 100755
@@ -23,7 +23,7 @@
 
 # generic initialization
 iam=new
-. ./common.rc
+. ./common/rc
 
 trap "rm -f /tmp/$$.; exit" 0 1 2 3 15
 
Signature · 6 lines
1.8.1.4

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
#1 lore raw
Quoted 13 lines · Eryu Guan

After the re-factor common.rc has been renamed to common/rc, fix the path in script new, otherwise ./new reports

./new: line 26: ./common.rc: No such file or directory Building include
Building lib
Building ltp
Building src
Building m4
./new: line 70: BEGIN{printf "%03d\n",+1}: command not found Next test is
Error: test already exists!

Quoted 7 lines

---
After applying this patch, ./new generates new test starting from 001, so we have to maintain the seq number manually? Do we need an updated version of new? eg. takes an argument to specify the test type like

./new generic

That's a good idea, and numbers based on the next number for that test type.

Quoted 12 lines

and generates new test based on existing seq number in generic dir.

  new | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
new +0 -0
index 94638f6..b21e75b 100755

new line 29

Quoted 8 lines
new +1 -1
@@ -23,7 +23,7 @@
 
  # generic initialization
  iam=new
-. ./common.rc
+. ./common/rc
 
  trap "rm -f /tmp/$$.; exit" 0 1 2 3 15
 

You caught the first one but I think you should also change the template entries too:

123 # get standard environment, filters and checks 124 . ./common/rc
125 . ./common/filter

Other than that looks good.

--Rich

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs

#2 lore raw
Quoted 4 lines · Rich Johnston

You caught the first one but I think you should also change the template entries too:

Quoted 9 lines

123 # get standard environment, filters and checks 124 . ./common/rc
125 . ./common/filter

Other than that looks good.

--Rich

I also noticed that there are several echo statements in the common directory that should be cleaned up with:

cd xfstests/common/
for f in ls; do sed -i -e's/common\./common\//g' $f; done

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs

#3 lore raw
In reply to Eryu Guan
Quoted 14 lines · Eryu Guan

After the re-factor common.rc has been renamed to common/rc, fix the path in script new, otherwise ./new reports

./new: line 26: ./common.rc: No such file or directory Building include
Building lib
Building ltp
Building src
Building m4
./new: line 70: BEGIN{printf "%03d\n",+1}: command not found Next test is
Error: test already exists!

Quoted 8 lines

---
After applying this patch, ./new generates new test starting from 001, so we have to maintain the seq number manually? Do we need an updated version of new? eg. takes an argument to specify the test type like

./new generic

and generates new test based on existing seq number in generic dir.

We could, but this all has to change when we allow non-numeric test names. i.e. the 'new' script is just creating a test template and you can simply copy it to where ever you need with the appropriate name. So just fixing the includes are appropriate right now, I think...

Cheers,

Dave.

Signature · 7 lines
Dave Chinner
[email protected]

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs