Denis Vlasenko | cee01cf | 2008-03-24 20:33:47 +0000 | [diff] [blame] | 1 | #!/bin/sh |
| 2 | # Copyright 2008 by Denys Vlasenko |
| 3 | # Licensed under GPL v2, see file LICENSE for details. |
| 4 | |
Mike Frysinger | caa7940 | 2009-11-04 18:41:22 -0500 | [diff] [blame] | 5 | . ./testing.sh |
Denis Vlasenko | cee01cf | 2008-03-24 20:33:47 +0000 | [diff] [blame] | 6 | |
| 7 | # testing "test name" "options" "expected result" "file input" "stdin" |
| 8 | |
| 9 | # diff outputs date/time in the header, which should not be analysed |
| 10 | # NB: sed has tab character in s command! |
| 11 | TRIM_TAB="sed 's/ .*//'" |
| 12 | |
| 13 | testing "diff of stdin" \ |
| 14 | "diff -u - input | $TRIM_TAB" \ |
| 15 | "\ |
| 16 | --- - |
| 17 | +++ input |
| 18 | @@ -1 +1,3 @@ |
| 19 | +qwe |
| 20 | asd |
| 21 | +zxc |
| 22 | " \ |
| 23 | "qwe\nasd\nzxc\n" \ |
| 24 | "asd\n" |
| 25 | |
| 26 | testing "diff of stdin, no newline in the file" \ |
| 27 | "diff -u - input | $TRIM_TAB" \ |
| 28 | "\ |
| 29 | --- - |
| 30 | +++ input |
| 31 | @@ -1 +1,3 @@ |
| 32 | +qwe |
| 33 | asd |
| 34 | +zxc |
| 35 | \\ No newline at end of file |
| 36 | " \ |
| 37 | "qwe\nasd\nzxc" \ |
| 38 | "asd\n" |
| 39 | |
| 40 | # we also test that stdin is in fact NOT read |
| 41 | testing "diff of stdin, twice" \ |
Denys Vlasenko | b972f94 | 2010-01-18 01:04:20 +0100 | [diff] [blame] | 42 | 'diff - -; echo $?; wc -c' \ |
Denis Vlasenko | cee01cf | 2008-03-24 20:33:47 +0000 | [diff] [blame] | 43 | "0\n5\n" \ |
| 44 | "" \ |
| 45 | "stdin" |
| 46 | |
Matheus Izvekov | 6f99c91 | 2010-01-21 18:58:03 -0200 | [diff] [blame] | 47 | testing "diff of empty file against nonempty one" \ |
| 48 | "diff -u - input | $TRIM_TAB" \ |
| 49 | "\ |
| 50 | --- - |
| 51 | +++ input |
| 52 | @@ -0,0 +1 @@ |
| 53 | +a |
| 54 | " \ |
| 55 | "a\n" \ |
| 56 | "" |
| 57 | |
Denys Vlasenko | b972f94 | 2010-01-18 01:04:20 +0100 | [diff] [blame] | 58 | testing "diff -b treats EOF as whitespace" \ |
| 59 | 'diff -ub - input; echo $?' \ |
| 60 | "0\n" \ |
| 61 | "abc" \ |
| 62 | "abc " |
| 63 | |
Denys Vlasenko | b972f94 | 2010-01-18 01:04:20 +0100 | [diff] [blame] | 64 | testing "diff -b treats all spaces as equal" \ |
| 65 | 'diff -ub - input; echo $?' \ |
| 66 | "0\n" \ |
| 67 | "a \t c\n" \ |
| 68 | "a\t \tc\n" |
| 69 | |
Matheus Izvekov | 6f99c91 | 2010-01-21 18:58:03 -0200 | [diff] [blame] | 70 | testing "diff -B ignores changes whose lines are all blank" \ |
| 71 | 'diff -uB - input; echo $?' \ |
| 72 | "0\n" \ |
| 73 | "a\n" \ |
| 74 | "\na\n\n" |
| 75 | |
| 76 | testing "diff -B does not ignore changes whose lines are not all blank" \ |
| 77 | "diff -uB - input | $TRIM_TAB" \ |
| 78 | "\ |
| 79 | --- - |
| 80 | +++ input |
| 81 | @@ -1,3 +1 @@ |
| 82 | - |
| 83 | -b |
| 84 | - |
| 85 | +a |
| 86 | " \ |
| 87 | "a\n" \ |
| 88 | "\nb\n\n" |
| 89 | |
Denys Vlasenko | b972f94 | 2010-01-18 01:04:20 +0100 | [diff] [blame] | 90 | testing "diff always takes context from old file" \ |
| 91 | "diff -ub - input | $TRIM_TAB" \ |
| 92 | "\ |
| 93 | --- - |
| 94 | +++ input |
| 95 | @@ -1 +1,3 @@ |
| 96 | +abc |
| 97 | a c |
| 98 | +def |
| 99 | " \ |
| 100 | "abc\na c\ndef\n" \ |
| 101 | "a c\n" |
| 102 | |
Denis Vlasenko | cee01cf | 2008-03-24 20:33:47 +0000 | [diff] [blame] | 103 | # testing "test name" "options" "expected result" "file input" "stdin" |
| 104 | |
| 105 | rm -rf diff1 diff2 |
| 106 | mkdir diff1 diff2 diff2/subdir |
| 107 | echo qwe >diff1/- |
| 108 | echo asd >diff2/subdir/- |
Denys Vlasenko | bfa1b2e | 2010-05-11 03:53:57 +0200 | [diff] [blame] | 109 | optional FEATURE_DIFF_DIR |
Denis Vlasenko | cee01cf | 2008-03-24 20:33:47 +0000 | [diff] [blame] | 110 | testing "diff diff1 diff2/subdir" \ |
| 111 | "diff -ur diff1 diff2/subdir | $TRIM_TAB" \ |
| 112 | "\ |
| 113 | --- diff1/- |
| 114 | +++ diff2/subdir/- |
| 115 | @@ -1 +1 @@ |
| 116 | -qwe |
| 117 | +asd |
| 118 | " \ |
| 119 | "" "" |
Denys Vlasenko | bfa1b2e | 2010-05-11 03:53:57 +0200 | [diff] [blame] | 120 | SKIP= |
Denis Vlasenko | cee01cf | 2008-03-24 20:33:47 +0000 | [diff] [blame] | 121 | |
| 122 | # using directory structure from prev test... |
Denys Vlasenko | bfa1b2e | 2010-05-11 03:53:57 +0200 | [diff] [blame] | 123 | optional FEATURE_DIFF_DIR |
Denis Vlasenko | cee01cf | 2008-03-24 20:33:47 +0000 | [diff] [blame] | 124 | testing "diff dir dir2/file/-" \ |
| 125 | "diff -ur diff1 diff2/subdir/- | $TRIM_TAB" \ |
| 126 | "\ |
| 127 | --- diff1/- |
| 128 | +++ diff2/subdir/- |
| 129 | @@ -1 +1 @@ |
| 130 | -qwe |
| 131 | +asd |
| 132 | " \ |
| 133 | "" "" |
Denys Vlasenko | bfa1b2e | 2010-05-11 03:53:57 +0200 | [diff] [blame] | 134 | SKIP= |
Denis Vlasenko | cee01cf | 2008-03-24 20:33:47 +0000 | [diff] [blame] | 135 | |
| 136 | # using directory structure from prev test... |
| 137 | mkdir diff1/test |
| 138 | mkfifo diff2/subdir/test |
Denys Vlasenko | bfa1b2e | 2010-05-11 03:53:57 +0200 | [diff] [blame] | 139 | optional FEATURE_DIFF_DIR |
Denis Vlasenko | cee01cf | 2008-03-24 20:33:47 +0000 | [diff] [blame] | 140 | testing "diff of dir and fifo" \ |
| 141 | "diff -ur diff1 diff2/subdir | $TRIM_TAB" \ |
| 142 | "\ |
| 143 | --- diff1/- |
| 144 | +++ diff2/subdir/- |
| 145 | @@ -1 +1 @@ |
| 146 | -qwe |
| 147 | +asd |
| 148 | Only in diff2/subdir: test |
| 149 | " \ |
| 150 | "" "" |
Denys Vlasenko | bfa1b2e | 2010-05-11 03:53:57 +0200 | [diff] [blame] | 151 | SKIP= |
Denis Vlasenko | cee01cf | 2008-03-24 20:33:47 +0000 | [diff] [blame] | 152 | |
| 153 | # using directory structure from prev test... |
| 154 | rmdir diff1/test |
| 155 | echo >diff1/test |
Denys Vlasenko | bfa1b2e | 2010-05-11 03:53:57 +0200 | [diff] [blame] | 156 | optional FEATURE_DIFF_DIR |
Denis Vlasenko | cee01cf | 2008-03-24 20:33:47 +0000 | [diff] [blame] | 157 | testing "diff of file and fifo" \ |
| 158 | "diff -ur diff1 diff2/subdir | $TRIM_TAB" \ |
| 159 | "\ |
| 160 | --- diff1/- |
| 161 | +++ diff2/subdir/- |
| 162 | @@ -1 +1 @@ |
| 163 | -qwe |
| 164 | +asd |
| 165 | File diff2/subdir/test is not a regular file or directory and was skipped |
| 166 | " \ |
| 167 | "" "" |
Denys Vlasenko | bfa1b2e | 2010-05-11 03:53:57 +0200 | [diff] [blame] | 168 | SKIP= |
Denis Vlasenko | cee01cf | 2008-03-24 20:33:47 +0000 | [diff] [blame] | 169 | |
| 170 | # using directory structure from prev test... |
| 171 | mkfifo diff1/test2 |
Denys Vlasenko | bfa1b2e | 2010-05-11 03:53:57 +0200 | [diff] [blame] | 172 | optional FEATURE_DIFF_DIR |
Denis Vlasenko | cee01cf | 2008-03-24 20:33:47 +0000 | [diff] [blame] | 173 | testing "diff -rN does not read non-regular files" \ |
| 174 | "diff -urN diff1 diff2/subdir | $TRIM_TAB" \ |
| 175 | "\ |
| 176 | --- diff1/- |
| 177 | +++ diff2/subdir/- |
| 178 | @@ -1 +1 @@ |
| 179 | -qwe |
| 180 | +asd |
| 181 | File diff2/subdir/test is not a regular file or directory and was skipped |
| 182 | File diff1/test2 is not a regular file or directory and was skipped |
| 183 | " \ |
| 184 | "" "" |
Denys Vlasenko | bfa1b2e | 2010-05-11 03:53:57 +0200 | [diff] [blame] | 185 | SKIP= |
Denis Vlasenko | cee01cf | 2008-03-24 20:33:47 +0000 | [diff] [blame] | 186 | |
| 187 | # clean up |
| 188 | rm -rf diff1 diff2 |
| 189 | |
| 190 | exit $FAILCOUNT |