Need LC_COLLATE set for sort like we do in other qa tests.

We need a repeatable sort order.
Merge of master-melb:xfs-cmds:25663a by kenmcd.

  Execute bits changed from xxx to x--
  Need LC_COLLATE set for sort like we do in other qa tests.
  We need a repeatable sort order.

diff --git a/019 b/019
index 8ffcc33ac1da3c8b937092f33bb53992f73feff4..0d0165e80e9f9bcbf60891c27d3dec1f03aa48ef 100755 (executable)
--- a/019
+++ b/019
@@ -113,7 +113,7 @@ _verify_fs()
                || _fail "mount failed"
 
        echo "*** verify FS"
-       (cd $SCRATCH_MNT ; find . | sort \
+       (cd $SCRATCH_MNT ; find . | LC_COLLATE=POSIX sort \
                | xargs $here/src/lstat64 | _filter_stat)
        diff -q $SCRATCH_MNT/bigfile $tempfile.2 \
                || _fail "bigfile corrupted"

diff --git a/065 b/065
index 61040ce820dd4a45828d6a118554d9c6589c86b9..b193f28e9778543786be79a05dcf85e943dd5cc4 100755 (executable)
--- a/065
+++ b/065
@@ -40,7 +40,7 @@ _list_dir()
     sed -e 's/.*restoredir/restoredir/' -e '/^restoredir /d' |\
     egrep -v 'housekeeping|dirattr|dirextattr|namreg|state|tree' |\
     awk '$3 ~ /^d/ { $2 = "XXX" } {print}' |\
-    sort
+    LC_COLLATE=POSIX sort
 } 
 
 # real QA test starts here

diff --git a/065.out b/065.out
index 76d11d31546e871303ad80cb6f19f4ab20769f7c..540b3eb7f0098abafba6a4c48af0ef04bca9771a 100644 (file)
--- a/065.out
+++ b/065.out
@@ -3,10 +3,10 @@ Do the incremental dumps
 Listing of what files we have at level 0:
 dumpdir/addeddir1 XXX drwxr-xr-x 0,0
 dumpdir/addeddir2 XXX drwxr-xr-x 0,0
-dumpdir/addeddir3/addedfile4 5 -rw-r--r-- 0,0
 dumpdir/addeddir3 XXX drwxr-xr-x 0,0
-dumpdir/addeddir4/addedfile5 5 -rw-r--r-- 0,0
+dumpdir/addeddir3/addedfile4 5 -rw-r--r-- 0,0
 dumpdir/addeddir4 XXX drwxr-xr-x 0,0
+dumpdir/addeddir4/addedfile5 5 -rw-r--r-- 0,0
 dumpdir/addedfile0 5 -rw-r--r-- 0,0
 dumpdir/addedfile1 5 -rw-r--r-- 0,0
 dumpdir/addedfile2 5 -rw-r--r-- 0,0
@@ -37,8 +37,8 @@ xfsdump: dump complete: SECS seconds elapsed
 xfsdump: Dump Status: SUCCESS
 Listing of what files we have at level 1:
 dumpdir/addeddir1 XXX drwxr-xr-x 0,0
-dumpdir/addeddir4/addedfile5 5 -rw-r--r-- 0,0
 dumpdir/addeddir4 XXX drwxr-xr-x 0,0
+dumpdir/addeddir4/addedfile5 5 -rw-r--r-- 0,0
 dumpdir/addedfile0 5 -rw-r--r-- 0,0
 dumpdir/addedfile1 5 -rw-r--r-- 0,0
 dumpdir/addedfile3 5 -rw-r--r-- 0,0
@@ -67,8 +67,8 @@ xfsdump: dump complete: SECS seconds elapsed
 xfsdump: Dump Status: SUCCESS
 Listing of what files we have at level 2:
 dumpdir/addeddir2 XXX drwxr-xr-x 0,0
-dumpdir/addeddir6/addedfile4 5 -rw-r--r-- 0,0
 dumpdir/addeddir6 XXX drwxr-xr-x 0,0
+dumpdir/addeddir6/addedfile4 5 -rw-r--r-- 0,0
 dumpdir/addedfile0 5 -rw-r--r-- 0,0
 dumpdir/addedfile2 5 -rw-r--r-- 0,0
 dumpdir/addedfile3 5 -rw-r--r-- 0,0
@@ -97,13 +97,13 @@ xfsdump: dump complete: SECS seconds elapsed
 xfsdump: Dump Status: SUCCESS
 Listing of what files we have at level 3:
 dumpdir/addeddir2 XXX drwxr-xr-x 0,0
-dumpdir/addeddir6/addedfile4 5 -rw-r--r-- 0,0
 dumpdir/addeddir6 XXX drwxr-xr-x 0,0
+dumpdir/addeddir6/addedfile4 5 -rw-r--r-- 0,0
 dumpdir/addedfile0 5 -rw-r--r-- 0,0
 dumpdir/addedfile2 5 -rw-r--r-- 0,0
 dumpdir/addedfile3 5 -rw-r--r-- 0,0
-dumpdir/linkfile0_1 5 -rw-r--r-- 0,0
 dumpdir/linkfile0 5 -rw-r--r-- 0,0
+dumpdir/linkfile0_1 5 -rw-r--r-- 0,0
 dumpdir/linkfile2 5 -rw-r--r-- 0,0
 dumpdir/linkfile64 5 -rw-r--r-- 0,0
 Dumping to file...
@@ -569,10 +569,10 @@ xfsrestore: Restore Status: SUCCESS
 list restore_dir
 dumpdir/addeddir1 XXX drwxr-xr-x 0,0
 dumpdir/addeddir2 XXX drwxr-xr-x 0,0
-dumpdir/addeddir3/addedfile4 5 -rw-r--r-- 0,0
 dumpdir/addeddir3 XXX drwxr-xr-x 0,0
-dumpdir/addeddir4/addedfile5 5 -rw-r--r-- 0,0
+dumpdir/addeddir3/addedfile4 5 -rw-r--r-- 0,0
 dumpdir/addeddir4 XXX drwxr-xr-x 0,0
+dumpdir/addeddir4/addedfile5 5 -rw-r--r-- 0,0
 dumpdir/addedfile0 5 -rw-r--r-- 0,0
 dumpdir/addedfile1 5 -rw-r--r-- 0,0
 dumpdir/addedfile2 5 -rw-r--r-- 0,0
@@ -605,8 +605,8 @@ xfsrestore: restore complete: SECS seconds elapsed
 xfsrestore: Restore Status: SUCCESS
 list restore_dir
 dumpdir/addeddir1 XXX drwxr-xr-x 0,0
-dumpdir/addeddir4/addedfile5 5 -rw-r--r-- 0,0
 dumpdir/addeddir4 XXX drwxr-xr-x 0,0
+dumpdir/addeddir4/addedfile5 5 -rw-r--r-- 0,0
 dumpdir/addedfile0 5 -rw-r--r-- 0,0
 dumpdir/addedfile1 5 -rw-r--r-- 0,0
 dumpdir/addedfile3 5 -rw-r--r-- 0,0
@@ -638,8 +638,8 @@ xfsrestore: restore complete: SECS seconds elapsed
 xfsrestore: Restore Status: SUCCESS
 list restore_dir
 dumpdir/addeddir2 XXX drwxr-xr-x 0,0
-dumpdir/addeddir6/addedfile4 5 -rw-r--r-- 0,0
 dumpdir/addeddir6 XXX drwxr-xr-x 0,0
+dumpdir/addeddir6/addedfile4 5 -rw-r--r-- 0,0
 dumpdir/addedfile0 5 -rw-r--r-- 0,0
 dumpdir/addedfile2 5 -rw-r--r-- 0,0
 dumpdir/addedfile3 5 -rw-r--r-- 0,0
@@ -671,13 +671,13 @@ xfsrestore: restore complete: SECS seconds elapsed
 xfsrestore: Restore Status: SUCCESS
 list restore_dir
 dumpdir/addeddir2 XXX drwxr-xr-x 0,0
-dumpdir/addeddir6/addedfile4 5 -rw-r--r-- 0,0
 dumpdir/addeddir6 XXX drwxr-xr-x 0,0
+dumpdir/addeddir6/addedfile4 5 -rw-r--r-- 0,0
 dumpdir/addedfile0 5 -rw-r--r-- 0,0
 dumpdir/addedfile2 5 -rw-r--r-- 0,0
 dumpdir/addedfile3 5 -rw-r--r-- 0,0
-dumpdir/linkfile0_1 5 -rw-r--r-- 0,0
 dumpdir/linkfile0 5 -rw-r--r-- 0,0
+dumpdir/linkfile0_1 5 -rw-r--r-- 0,0
 dumpdir/linkfile2 5 -rw-r--r-- 0,0
 dumpdir/linkfile64 5 -rw-r--r-- 0,0