@@ -226,6 +226,7 @@ if [ ! -d "$srcdir" ]; then
226
226
exit 2
227
227
fi
228
228
229
+ expect_skipped=" ${RSYNC_EXPECT_SKIPPED-IGNORE} "
229
230
skipped_list=' '
230
231
skipped=0
231
232
missing=0
@@ -335,6 +336,15 @@ echo " $passed passed"
335
336
[ " $failed " -gt 0 ] && echo " $failed failed"
336
337
[ " $skipped " -gt 0 ] && echo " $skipped skipped"
337
338
[ " $missing " -gt 0 ] && echo " $missing missing"
339
+ if [ " $full_run " = yes -a " $expect_skipped " != IGNORE ]; then
340
+ skipped_list=` echo " $skipped_list " | sed ' s/^,//' `
341
+ echo " ----- skipped results:"
342
+ echo " expected: $expect_skipped "
343
+ echo " got: $skipped_list "
344
+ else
345
+ skipped_list=' '
346
+ expect_skipped=' '
347
+ fi
338
348
echo ' ------------------------------------------------------------'
339
349
340
350
# OK, so expr exits with 0 if the result is neither null nor zero; and
@@ -343,14 +353,8 @@ echo '------------------------------------------------------------'
343
353
# because -e is set.
344
354
345
355
result=` expr $failed + $missing || true`
346
- if [ " $result$full_run " = 0yes ]; then
347
- expect_skipped=" ${RSYNC_EXPECT_SKIPPED:- IGNORE} "
348
- skipped_list=` echo " $skipped_list " | sed ' s/^,//' `
349
- if [ " $expect_skipped " != IGNORE -a " $skipped_list " != " $expect_skipped " ]; then
350
- echo " Skips expected: $expect_skipped "
351
- echo " Skips got: $skipped_list "
352
- result=1
353
- fi
356
+ if [ " $result " = 0 -a " $skipped_list " != " $expect_skipped " ]; then
357
+ result=1
354
358
fi
355
359
echo " overall result is $result "
356
360
exit $result
0 commit comments