Module Name: src
Committed By: apb
Date: Sat Sep 19 21:42:26 UTC 2009
Modified Files:
src/tests/util/mtree: d_convert_C.out d_convert_C_S.out d_merge_C_M.out
d_merge_C_M_S.out
Log Message:
Adjust tests to no longer expect a trailing space in each line
of output from "mtree -C".
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/util/mtree/d_convert_C.out
cvs rdiff -u -r1.1 -r1.2 src/tests/util/mtree/d_convert_C_S.out \
src/tests/util/mtree/d_merge_C_M.out \
src/tests/util/mtree/d_merge_C_M_S.out
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/util/mtree/d_convert_C.out
diff -u src/tests/util/mtree/d_convert_C.out:1.2 src/tests/util/mtree/d_convert_C.out:1.3
--- src/tests/util/mtree/d_convert_C.out:1.2 Wed Apr 8 19:06:30 2009
+++ src/tests/util/mtree/d_convert_C.out Sat Sep 19 21:42:26 2009
@@ -1,14 +1,14 @@
-. type=dir
-./a.symlink.1 type=link link=a.file.1
-./top.dangling type=link link=nonexistent
-./top.symlink.b type=link link=b
-./b type=dir
-./b/b.file.2 type=file
-./b/b.file.1 type=file
-./top.file.1 type=file
-./a type=dir
-./a/a.file.2 type=file
-./a/1 type=dir
-./a/1/a1.file.1 type=file
-./a/a.file.1 type=file
-./a/2 type=dir
+. type=dir
+./a.symlink.1 type=link link=a.file.1
+./top.dangling type=link link=nonexistent
+./top.symlink.b type=link link=b
+./b type=dir
+./b/b.file.2 type=file
+./b/b.file.1 type=file
+./top.file.1 type=file
+./a type=dir
+./a/a.file.2 type=file
+./a/1 type=dir
+./a/1/a1.file.1 type=file
+./a/a.file.1 type=file
+./a/2 type=dir
Index: src/tests/util/mtree/d_convert_C_S.out
diff -u src/tests/util/mtree/d_convert_C_S.out:1.1 src/tests/util/mtree/d_convert_C_S.out:1.2
--- src/tests/util/mtree/d_convert_C_S.out:1.1 Wed Apr 8 19:06:30 2009
+++ src/tests/util/mtree/d_convert_C_S.out Sat Sep 19 21:42:26 2009
@@ -1,14 +1,14 @@
-. type=dir
-./a.symlink.1 type=link link=a.file.1
-./top.dangling type=link link=nonexistent
-./top.file.1 type=file
-./top.symlink.b type=link link=b
-./a type=dir
-./a/a.file.1 type=file
-./a/a.file.2 type=file
-./a/1 type=dir
-./a/1/a1.file.1 type=file
-./a/2 type=dir
-./b type=dir
-./b/b.file.1 type=file
-./b/b.file.2 type=file
+. type=dir
+./a.symlink.1 type=link link=a.file.1
+./top.dangling type=link link=nonexistent
+./top.file.1 type=file
+./top.symlink.b type=link link=b
+./a type=dir
+./a/a.file.1 type=file
+./a/a.file.2 type=file
+./a/1 type=dir
+./a/1/a1.file.1 type=file
+./a/2 type=dir
+./b type=dir
+./b/b.file.1 type=file
+./b/b.file.2 type=file
Index: src/tests/util/mtree/d_merge_C_M.out
diff -u src/tests/util/mtree/d_merge_C_M.out:1.1 src/tests/util/mtree/d_merge_C_M.out:1.2
--- src/tests/util/mtree/d_merge_C_M.out:1.1 Sat Sep 19 20:37:05 2009
+++ src/tests/util/mtree/d_merge_C_M.out Sat Sep 19 21:42:26 2009
@@ -1,13 +1,13 @@
-. type=dir
-./a type=dir
-./a/change-dir-to-link type=link mode=0755
-./b type=dir
-./b/change-link-to-dir type=dir mode=0755
-./c type=dir
-./c/aaa type=file
-./c/zzz type=file
-./c/change-dir-to-link type=link mode=0755
-./d type=dir
-./d/aaa type=file
-./d/zzz type=file
-./d/change-link-to-dir type=dir mode=0755
+. type=dir
+./a type=dir
+./a/change-dir-to-link type=link mode=0755
+./b type=dir
+./b/change-link-to-dir type=dir mode=0755
+./c type=dir
+./c/aaa type=file
+./c/zzz type=file
+./c/change-dir-to-link type=link mode=0755
+./d type=dir
+./d/aaa type=file
+./d/zzz type=file
+./d/change-link-to-dir type=dir mode=0755
Index: src/tests/util/mtree/d_merge_C_M_S.out
diff -u src/tests/util/mtree/d_merge_C_M_S.out:1.1 src/tests/util/mtree/d_merge_C_M_S.out:1.2
--- src/tests/util/mtree/d_merge_C_M_S.out:1.1 Sat Sep 19 20:37:05 2009
+++ src/tests/util/mtree/d_merge_C_M_S.out Sat Sep 19 21:42:26 2009
@@ -1,13 +1,13 @@
-. type=dir
-./a type=dir
-./a/change-dir-to-link type=link mode=0755
-./b type=dir
-./b/change-link-to-dir type=dir mode=0755
-./c type=dir
-./c/aaa type=file
-./c/change-dir-to-link type=link mode=0755
-./c/zzz type=file
-./d type=dir
-./d/aaa type=file
-./d/zzz type=file
-./d/change-link-to-dir type=dir mode=0755
+. type=dir
+./a type=dir
+./a/change-dir-to-link type=link mode=0755
+./b type=dir
+./b/change-link-to-dir type=dir mode=0755
+./c type=dir
+./c/aaa type=file
+./c/change-dir-to-link type=link mode=0755
+./c/zzz type=file
+./d type=dir
+./d/aaa type=file
+./d/zzz type=file
+./d/change-link-to-dir type=dir mode=0755
