Skip to content

Commit ac08fa7

Browse files
committed
Tweak output about skipped tests.
1 parent d5d4ae5 commit ac08fa7

File tree

1 file changed

+12
-8
lines changed

1 file changed

+12
-8
lines changed

runtests.sh

+12-8
Original file line numberDiff line numberDiff line change
@@ -226,6 +226,7 @@ if [ ! -d "$srcdir" ]; then
226226
exit 2
227227
fi
228228

229+
expect_skipped="${RSYNC_EXPECT_SKIPPED-IGNORE}"
229230
skipped_list=''
230231
skipped=0
231232
missing=0
@@ -335,6 +336,15 @@ echo " $passed passed"
335336
[ "$failed" -gt 0 ] && echo " $failed failed"
336337
[ "$skipped" -gt 0 ] && echo " $skipped skipped"
337338
[ "$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
338348
echo '------------------------------------------------------------'
339349

340350
# OK, so expr exits with 0 if the result is neither null nor zero; and
@@ -343,14 +353,8 @@ echo '------------------------------------------------------------'
343353
# because -e is set.
344354

345355
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
354358
fi
355359
echo "overall result is $result"
356360
exit $result

0 commit comments

Comments
 (0)