Skip to content

Commit 24aa7fa

Browse files
committed
Switch to using automake parallel test harness as it
automatically puts test output into log files, summarizes the logs, and produces nicer (1 line per test) output to stdout when running the tests.
1 parent f1d58d1 commit 24aa7fa

File tree

2 files changed

+15
-11
lines changed

2 files changed

+15
-11
lines changed

tests/.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
*.o
22
*.lo
33
*.la
4+
*.log
5+
*.trs
46
.libs
57
bsdtestharness
68
bsdtestsummarize

tests/Makefile.am

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#
33
#
44

5-
AUTOMAKE_OPTIONS = serial-tests subdir-objects
5+
AUTOMAKE_OPTIONS = subdir-objects
66

77
noinst_LTLIBRARIES=libbsdtests.la
88

@@ -26,10 +26,7 @@ UNPORTED_TESTS= \
2626
dispatch_vm \
2727
dispatch_vnode
2828

29-
PORTED_TESTS_FAILED= \
30-
dispatch_concur
31-
32-
PORTED_TESTS_PASSED= \
29+
TESTS= \
3330
dispatch_apply \
3431
dispatch_api \
3532
dispatch_c99 \
@@ -41,6 +38,7 @@ PORTED_TESTS_PASSED= \
4138
dispatch_plusplus \
4239
dispatch_priority \
4340
dispatch_priority2 \
41+
dispatch_concur \
4442
dispatch_context_for_key \
4543
dispatch_read \
4644
dispatch_read2 \
@@ -62,13 +60,17 @@ PORTED_TESTS_PASSED= \
6260
dispatch_io_net \
6361
dispatch_select
6462

65-
ORIGINAL_LIST_OF_TESTS= \
63+
# List tests that are expected to fail here.
64+
# Currently dispatch_concur fails occasionally, but passes more often than fails.
65+
XFAIL_TESTS =
66+
67+
ORIGINAL_LIST_OF_TESTS= \
6668
dispatch_apply \
6769
dispatch_api \
6870
dispatch_c99 \
6971
dispatch_deadname \
7072
dispatch_debug \
71-
dispatch_queue_finalizer \
73+
dispatch_queue_finalizer \
7274
dispatch_group \
7375
dispatch_overcommit \
7476
dispatch_pingpong \
@@ -100,8 +102,6 @@ ORIGINAL_LIST_OF_TESTS= \
100102
dispatch_vnode \
101103
dispatch_select
102104

103-
TESTS=$(PORTED_TESTS_PASSED) $(PORTED_TESTS_FAILED)
104-
105105
dispatch_c99_CFLAGS=$(DISPATCH_TESTS_CFLAGS) $(CBLOCKS_FLAGS) $(KQUEUE_CFLAGS) -std=c99
106106
dispatch_plusplus_SOURCES=dispatch_plusplus.cpp
107107
dispatch_priority2_SOURCES=dispatch_priority.c
@@ -129,10 +129,12 @@ dispatch_timer_short_LDADD=-lm $(LDADD)
129129
dispatch_group_LDADD=-lm $(LDADD)
130130

131131
if HAVE_LEAKS
132-
TESTS_ENVIRONMENT=./bsdtestharness
132+
AM_TESTS_ENVIRONMENT=
133133
else
134-
TESTS_ENVIRONMENT=NOLEAKS=1 ./bsdtestharness
134+
AM_TESTS_ENVIRONMENT=NOLEAKS=1
135135
endif
136+
LOG_COMPILER=./bsdtestharness
137+
136138
DISTCLEAN=Foundation/bench.cc
137139

138140
if HAVE_COREFOUNDATION

0 commit comments

Comments
 (0)