summaryrefslogtreecommitdiff
path: root/testsuite/diff.tests
diff options
context:
space:
mode:
Diffstat (limited to 'testsuite/diff.tests')
-rwxr-xr-xtestsuite/diff.tests10
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
106mkdir diff1 diff2 diff2/subdir 106mkdir diff1 diff2 diff2/subdir
107echo qwe >diff1/- 107echo qwe >diff1/-
108echo asd >diff2/subdir/- 108echo asd >diff2/subdir/-
109optional FEATURE_DIFF_DIR
109testing "diff diff1 diff2/subdir" \ 110testing "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 "" ""
120SKIP=
119 121
120# using directory structure from prev test... 122# using directory structure from prev test...
123optional FEATURE_DIFF_DIR
121testing "diff dir dir2/file/-" \ 124testing "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 "" ""
134SKIP=
131 135
132# using directory structure from prev test... 136# using directory structure from prev test...
133mkdir diff1/test 137mkdir diff1/test
134mkfifo diff2/subdir/test 138mkfifo diff2/subdir/test
139optional FEATURE_DIFF_DIR
135testing "diff of dir and fifo" \ 140testing "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" \
143Only in diff2/subdir: test 148Only in diff2/subdir: test
144" \ 149" \
145 "" "" 150 "" ""
151SKIP=
146 152
147# using directory structure from prev test... 153# using directory structure from prev test...
148rmdir diff1/test 154rmdir diff1/test
149echo >diff1/test 155echo >diff1/test
156optional FEATURE_DIFF_DIR
150testing "diff of file and fifo" \ 157testing "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" \
158File diff2/subdir/test is not a regular file or directory and was skipped 165File diff2/subdir/test is not a regular file or directory and was skipped
159" \ 166" \
160 "" "" 167 "" ""
168SKIP=
161 169
162# using directory structure from prev test... 170# using directory structure from prev test...
163mkfifo diff1/test2 171mkfifo diff1/test2
172optional FEATURE_DIFF_DIR
164testing "diff -rN does not read non-regular files" \ 173testing "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
173File diff1/test2 is not a regular file or directory and was skipped 182File diff1/test2 is not a regular file or directory and was skipped
174" \ 183" \
175 "" "" 184 "" ""
185SKIP=
176 186
177# clean up 187# clean up
178rm -rf diff1 diff2 188rm -rf diff1 diff2