Transform output from first du, so that this

test doesn't fail on file systems like tmpfs that order directory
entries differently.

diff --git a/ChangeLog b/ChangeLog
index 2f2b7ce..f583832 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-03-14  Jim Meyering  <jim@meyering.net>
+
+       * tests/du/hard-link: Transform output from first du, so that this
+       test doesn't fail on file systems like tmpfs that order directory
+       entries differently.
+
 2003-03-13  Jim Meyering  <jim@meyering.net>
 
        * Version 4.5.10.

diff --git a/tests/du/hard-link b/tests/du/hard-link
index 5de5d81..6d0d711 100755 (executable)
--- a/tests/du/hard-link
+++ b/tests/du/hard-link
@@ -30,13 +30,17 @@ fi
 
 fail=0
 
+# Note that for this first test, we transform f1 or f2
+# (whichever name we find first) to f_.  That is necessary because,
+# depending on the type of file system, du could encounter either of those
+# two hard-linked files first, thus listing that one and not the other.
 du -a --exclude=sub dir \
-  | sed 's/^[0-9][0-9]*        //' > out || fail=1
+  | sed 's/^[0-9][0-9]*        //' | sed 's/f[12]/f_/' > out || fail=1
 echo === >> out
 du -a --exclude=sub --count-links dir \
   | sed 's/^[0-9][0-9]*        //' | sort -r >> out || fail=1
 cat <<\EOF > exp
-dir/f1
+dir/f_
 dir
 ===
 dir/f2