diff options
Diffstat (limited to 'testsuite/diff.tests')
-rwxr-xr-x | testsuite/diff.tests | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/testsuite/diff.tests b/testsuite/diff.tests index 72ebb6c4c..06d5a4fd7 100755 --- a/testsuite/diff.tests +++ b/testsuite/diff.tests | |||
@@ -106,6 +106,7 @@ rm -rf diff1 diff2 | |||
106 | mkdir diff1 diff2 diff2/subdir | 106 | mkdir diff1 diff2 diff2/subdir |
107 | echo qwe >diff1/- | 107 | echo qwe >diff1/- |
108 | echo asd >diff2/subdir/- | 108 | echo asd >diff2/subdir/- |
109 | optional FEATURE_DIFF_DIR | ||
109 | testing "diff diff1 diff2/subdir" \ | 110 | testing "diff diff1 diff2/subdir" \ |
110 | "diff -ur diff1 diff2/subdir | $TRIM_TAB" \ | 111 | "diff -ur diff1 diff2/subdir | $TRIM_TAB" \ |
111 | "\ | 112 | "\ |
@@ -116,8 +117,10 @@ testing "diff diff1 diff2/subdir" \ | |||
116 | +asd | 117 | +asd |
117 | " \ | 118 | " \ |
118 | "" "" | 119 | "" "" |
120 | SKIP= | ||
119 | 121 | ||
120 | # using directory structure from prev test... | 122 | # using directory structure from prev test... |
123 | optional FEATURE_DIFF_DIR | ||
121 | testing "diff dir dir2/file/-" \ | 124 | testing "diff dir dir2/file/-" \ |
122 | "diff -ur diff1 diff2/subdir/- | $TRIM_TAB" \ | 125 | "diff -ur diff1 diff2/subdir/- | $TRIM_TAB" \ |
123 | "\ | 126 | "\ |
@@ -128,10 +131,12 @@ testing "diff dir dir2/file/-" \ | |||
128 | +asd | 131 | +asd |
129 | " \ | 132 | " \ |
130 | "" "" | 133 | "" "" |
134 | SKIP= | ||
131 | 135 | ||
132 | # using directory structure from prev test... | 136 | # using directory structure from prev test... |
133 | mkdir diff1/test | 137 | mkdir diff1/test |
134 | mkfifo diff2/subdir/test | 138 | mkfifo diff2/subdir/test |
139 | optional FEATURE_DIFF_DIR | ||
135 | testing "diff of dir and fifo" \ | 140 | testing "diff of dir and fifo" \ |
136 | "diff -ur diff1 diff2/subdir | $TRIM_TAB" \ | 141 | "diff -ur diff1 diff2/subdir | $TRIM_TAB" \ |
137 | "\ | 142 | "\ |
@@ -143,10 +148,12 @@ testing "diff of dir and fifo" \ | |||
143 | Only in diff2/subdir: test | 148 | Only in diff2/subdir: test |
144 | " \ | 149 | " \ |
145 | "" "" | 150 | "" "" |
151 | SKIP= | ||
146 | 152 | ||
147 | # using directory structure from prev test... | 153 | # using directory structure from prev test... |
148 | rmdir diff1/test | 154 | rmdir diff1/test |
149 | echo >diff1/test | 155 | echo >diff1/test |
156 | optional FEATURE_DIFF_DIR | ||
150 | testing "diff of file and fifo" \ | 157 | testing "diff of file and fifo" \ |
151 | "diff -ur diff1 diff2/subdir | $TRIM_TAB" \ | 158 | "diff -ur diff1 diff2/subdir | $TRIM_TAB" \ |
152 | "\ | 159 | "\ |
@@ -158,9 +165,11 @@ testing "diff of file and fifo" \ | |||
158 | File diff2/subdir/test is not a regular file or directory and was skipped | 165 | File diff2/subdir/test is not a regular file or directory and was skipped |
159 | " \ | 166 | " \ |
160 | "" "" | 167 | "" "" |
168 | SKIP= | ||
161 | 169 | ||
162 | # using directory structure from prev test... | 170 | # using directory structure from prev test... |
163 | mkfifo diff1/test2 | 171 | mkfifo diff1/test2 |
172 | optional FEATURE_DIFF_DIR | ||
164 | testing "diff -rN does not read non-regular files" \ | 173 | testing "diff -rN does not read non-regular files" \ |
165 | "diff -urN diff1 diff2/subdir | $TRIM_TAB" \ | 174 | "diff -urN diff1 diff2/subdir | $TRIM_TAB" \ |
166 | "\ | 175 | "\ |
@@ -173,6 +182,7 @@ File diff2/subdir/test is not a regular file or directory and was skipped | |||
173 | File diff1/test2 is not a regular file or directory and was skipped | 182 | File diff1/test2 is not a regular file or directory and was skipped |
174 | " \ | 183 | " \ |
175 | "" "" | 184 | "" "" |
185 | SKIP= | ||
176 | 186 | ||
177 | # clean up | 187 | # clean up |
178 | rm -rf diff1 diff2 | 188 | rm -rf diff1 diff2 |