git svn info: tests: use test_cmp instead of git-diff
git-diff does not appear to return the correct exit values, and gives a false success for more than half (!) of the tests due to the space in "trash directory" which git-svn fails to encode. Signed-off-by: Thomas Rast <trast@student.ethz.ch> Acked-by: Eric Wong <normalperson@yhbt.net>
Thomas Rast committed
Aug 26, 2008 at 21:32 UTC
67214c85af7245a1f75da968334c529ec2610e70
1 file changed
+22
-22
t/t9119-git-svn-info.sh
+22
-22
@@ -60,7 +60,7 @@ test_expect_success 'setup repository and import' '
60
test_expect_success 'info' "
61
(cd svnwc; svn info) > expected.info &&
62
(cd gitwc; git-svn info) > actual.info &&
63
- git-diff expected.info actual.info
63
+ test_cmp expected.info actual.info
64
"
65
66
test_expect_success 'info --url' '
@@ -70,7 +70,7 @@ test_expect_success 'info --url' '
70
test_expect_success 'info .' "
71
(cd svnwc; svn info .) > expected.info-dot &&
72
(cd gitwc; git-svn info .) > actual.info-dot &&
73
- git-diff expected.info-dot actual.info-dot
73
+ test_cmp expected.info-dot actual.info-dot
74
"
75
76
test_expect_success 'info --url .' '
@@ -80,7 +80,7 @@ test_expect_success 'info --url .' '
80
test_expect_success 'info file' "
81
(cd svnwc; svn info file) > expected.info-file &&
82
(cd gitwc; git-svn info file) > actual.info-file &&
83
- git-diff expected.info-file actual.info-file
83
+ test_cmp expected.info-file actual.info-file
84
"
85
86
test_expect_success 'info --url file' '
@@ -90,7 +90,7 @@ test_expect_success 'info --url file' '
90
test_expect_success 'info directory' "
91
(cd svnwc; svn info directory) > expected.info-directory &&
92
(cd gitwc; git-svn info directory) > actual.info-directory &&
93
- git-diff expected.info-directory actual.info-directory
93
+ test_cmp expected.info-directory actual.info-directory
94
"
95
96
test_expect_success 'info --url directory' '
@@ -100,7 +100,7 @@ test_expect_success 'info --url directory' '
100
test_expect_success 'info symlink-file' "
101
(cd svnwc; svn info symlink-file) > expected.info-symlink-file &&
102
(cd gitwc; git-svn info symlink-file) > actual.info-symlink-file &&
103
- git-diff expected.info-symlink-file actual.info-symlink-file
103
+ test_cmp expected.info-symlink-file actual.info-symlink-file
104
"
105
106
test_expect_success 'info --url symlink-file' '
@@ -113,7 +113,7 @@ test_expect_success 'info symlink-directory' "
113
> expected.info-symlink-directory &&
114
(cd gitwc; git-svn info symlink-directory) \
115
> actual.info-symlink-directory &&
116
- git-diff expected.info-symlink-directory actual.info-symlink-directory
116
+ test_cmp expected.info-symlink-directory actual.info-symlink-directory
117
"
118
119
test_expect_success 'info --url symlink-directory' '
@@ -133,7 +133,7 @@ test_expect_success 'info added-file' "
133
cd .. &&
134
(cd svnwc; svn info added-file) > expected.info-added-file &&
135
(cd gitwc; git-svn info added-file) > actual.info-added-file &&
136
- git-diff expected.info-added-file actual.info-added-file
136
+ test_cmp expected.info-added-file actual.info-added-file
137
"
138
139
test_expect_success 'info --url added-file' '
@@ -155,7 +155,7 @@ test_expect_success 'info added-directory' "
155
> expected.info-added-directory &&
156
(cd gitwc; git-svn info added-directory) \
157
> actual.info-added-directory &&
158
- git-diff expected.info-added-directory actual.info-added-directory
158
+ test_cmp expected.info-added-directory actual.info-added-directory
159
"
160
161
test_expect_success 'info --url added-directory' '
@@ -177,7 +177,7 @@ test_expect_success 'info added-symlink-file' "
177
> expected.info-added-symlink-file &&
178
(cd gitwc; git-svn info added-symlink-file) \
179
> actual.info-added-symlink-file &&
180
- git-diff expected.info-added-symlink-file \
180
+ test_cmp expected.info-added-symlink-file \
181
actual.info-added-symlink-file
182
"
183
@@ -200,7 +200,7 @@ test_expect_success 'info added-symlink-directory' "
200
> expected.info-added-symlink-directory &&
201
(cd gitwc; git-svn info added-symlink-directory) \
202
> actual.info-added-symlink-directory &&
203
- git-diff expected.info-added-symlink-directory \
203
+ test_cmp expected.info-added-symlink-directory \
204
actual.info-added-symlink-directory
205
"
206
@@ -227,7 +227,7 @@ test_expect_success 'info deleted-file' "
227
(cd gitwc; git-svn info file) |
228
sed -e 's/^\(Text Last Updated:\).*/\1 TEXT-LAST-UPDATED-STRING/' \
229
> actual.info-deleted-file &&
230
- git-diff expected.info-deleted-file actual.info-deleted-file
230
+ test_cmp expected.info-deleted-file actual.info-deleted-file
231
"
232
233
test_expect_success 'info --url file (deleted)' '
@@ -248,7 +248,7 @@ test_expect_success 'info deleted-directory' "
248
(cd gitwc; git-svn info directory) |
249
sed -e 's/^\(Text Last Updated:\).*/\1 TEXT-LAST-UPDATED-STRING/' \
250
> actual.info-deleted-directory &&
251
- git-diff expected.info-deleted-directory actual.info-deleted-directory
251
+ test_cmp expected.info-deleted-directory actual.info-deleted-directory
252
"
253
254
test_expect_success 'info --url directory (deleted)' '
@@ -269,7 +269,7 @@ test_expect_success 'info deleted-symlink-file' "
269
(cd gitwc; git-svn info symlink-file) |
270
sed -e 's/^\(Text Last Updated:\).*/\1 TEXT-LAST-UPDATED-STRING/' \
271
> actual.info-deleted-symlink-file &&
272
- git-diff expected.info-deleted-symlink-file \
272
+ test_cmp expected.info-deleted-symlink-file \
273
actual.info-deleted-symlink-file
274
"
275
@@ -291,7 +291,7 @@ test_expect_success 'info deleted-symlink-directory' "
291
(cd gitwc; git-svn info symlink-directory) |
292
sed -e 's/^\(Text Last Updated:\).*/\1 TEXT-LAST-UPDATED-STRING/' \
293
> actual.info-deleted-symlink-directory &&
294
- git-diff expected.info-deleted-symlink-directory \
294
+ test_cmp expected.info-deleted-symlink-directory \
295
actual.info-deleted-symlink-directory
296
"
297
@@ -309,13 +309,13 @@ test_expect_success 'info unknown-file' "
309
ptouch gitwc/unknown-file svnwc/unknown-file &&
310
(cd svnwc; svn info unknown-file) 2> expected.info-unknown-file &&
311
(cd gitwc; git-svn info unknown-file) 2> actual.info-unknown-file &&
312
- git-diff expected.info-unknown-file actual.info-unknown-file
312
+ test_cmp expected.info-unknown-file actual.info-unknown-file
313
"
314
315
test_expect_success 'info --url unknown-file' '
316
test -z "$(cd gitwc; git-svn info --url unknown-file \
317
2> ../actual.info--url-unknown-file)" &&
318
- git-diff expected.info-unknown-file actual.info--url-unknown-file
318
+ test_cmp expected.info-unknown-file actual.info--url-unknown-file
319
'
320
321
test_expect_success 'info unknown-directory' "
@@ -326,13 +326,13 @@ test_expect_success 'info unknown-directory' "
326
2> expected.info-unknown-directory &&
327
(cd gitwc; git-svn info unknown-directory) \
328
2> actual.info-unknown-directory &&
329
- git-diff expected.info-unknown-directory actual.info-unknown-directory
329
+ test_cmp expected.info-unknown-directory actual.info-unknown-directory
330
"
331
332
test_expect_success 'info --url unknown-directory' '
333
test -z "$(cd gitwc; git-svn info --url unknown-directory \
334
2> ../actual.info--url-unknown-directory)" &&
335
- git-diff expected.info-unknown-directory \
335
+ test_cmp expected.info-unknown-directory \
336
actual.info--url-unknown-directory
337
'
338
@@ -348,14 +348,14 @@ test_expect_success 'info unknown-symlink-file' "
348
2> expected.info-unknown-symlink-file &&
349
(cd gitwc; git-svn info unknown-symlink-file) \
350
2> actual.info-unknown-symlink-file &&
351
- git-diff expected.info-unknown-symlink-file \
351
+ test_cmp expected.info-unknown-symlink-file \
352
actual.info-unknown-symlink-file
353
"
354
355
test_expect_success 'info --url unknown-symlink-file' '
356
test -z "$(cd gitwc; git-svn info --url unknown-symlink-file \
357
2> ../actual.info--url-unknown-symlink-file)" &&
358
- git-diff expected.info-unknown-symlink-file \
358
+ test_cmp expected.info-unknown-symlink-file \
359
actual.info--url-unknown-symlink-file
360
'
361
@@ -372,14 +372,14 @@ test_expect_success 'info unknown-symlink-directory' "
372
2> expected.info-unknown-symlink-directory &&
373
(cd gitwc; git-svn info unknown-symlink-directory) \
374
2> actual.info-unknown-symlink-directory &&
375
- git-diff expected.info-unknown-symlink-directory \
375
+ test_cmp expected.info-unknown-symlink-directory \
376
actual.info-unknown-symlink-directory
377
"
378
379
test_expect_success 'info --url unknown-symlink-directory' '
380
test -z "$(cd gitwc; git-svn info --url unknown-symlink-directory \
381
2> ../actual.info--url-unknown-symlink-directory)" &&
382
- git-diff expected.info-unknown-symlink-directory \
382
+ test_cmp expected.info-unknown-symlink-directory \
383
actual.info--url-unknown-symlink-directory
384
'
385