Skip to content

Commit 099d1a3

Browse files
committed
Specify test harness in Automake correctly
* Previously, `make distcheck` would fail with very high values of `-j`, due to a race condition in how the test harness was specified. We now use the vanilla (serial) testing paradigm recommended by Automake.
1 parent c8cbb42 commit 099d1a3

File tree

2 files changed

+21
-26
lines changed

2 files changed

+21
-26
lines changed

Makefile.am

Lines changed: 19 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -78,31 +78,26 @@ endif
7878
# tests/ #
7979
##########
8080

81-
check_PROGRAMS = tests/misc_test tests/termination_test tests/simple_test tests/callback_test \
82-
tests/reset_test tests/multi_channel_test tests/snr_bw_test tests/float_short_test \
83-
tests/varispeed_test tests/callback_hang_test tests/src-evaluate tests/throughput_test \
84-
tests/multichan_throughput_test tests/downsample_test tests/clone_test tests/nullptr_test
85-
86-
check: $(check_PROGRAMS)
87-
date
88-
uname -a
89-
tests/misc_test
90-
tests/termination_test
91-
tests/callback_hang_test
92-
tests/downsample_test
93-
tests/simple_test
94-
tests/callback_test
95-
tests/reset_test
96-
tests/clone_test
97-
tests/nullptr_test
98-
tests/multi_channel_test
81+
TESTS = \
82+
tests/callback_hang_test \
83+
tests/callback_test \
84+
tests/clone_test \
85+
tests/downsample_test \
86+
tests/float_short_test \
87+
tests/misc_test \
88+
tests/multi_channel_test \
89+
tests/nullptr_test \
90+
tests/reset_test \
91+
tests/simple_test \
92+
tests/snr_bw_test \
93+
tests/termination_test \
94+
tests/throughput_test \
9995
tests/varispeed_test
100-
tests/float_short_test
101-
tests/snr_bw_test
102-
tests/throughput_test
103-
@echo "-----------------------------------------------------------------"
104-
@echo " ${PACKAGE}-${VERSION} passed all tests."
105-
@echo "-----------------------------------------------------------------"
96+
97+
check_PROGRAMS = \
98+
$(TESTS) \
99+
tests/multichan_throughput_test \
100+
tests/src-evaluate
106101

107102
#===============================================================================
108103

configure.ac

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (C) 2002-2017 Erik de Castro Lopo (erikd AT mega-nerd DOT com).
1+
# Copyright (C) 2002-2021 Erik de Castro Lopo (erikd AT mega-nerd DOT com).
22

33
dnl Require autoconf version >= 2.69)
44
AC_PREREQ([2.69])
@@ -27,7 +27,7 @@ AC_CANONICAL_HOST
2727
AC_CONFIG_MACRO_DIR([m4])
2828
AC_CONFIG_HEADERS([src/config.h])
2929

30-
AM_INIT_AUTOMAKE([1.14 foreign dist-bzip2 no-dist-gzip subdir-objects])
30+
AM_INIT_AUTOMAKE([1.14 foreign dist-bzip2 no-dist-gzip subdir-objects serial-tests])
3131
AM_SILENT_RULES([yes])
3232

3333
dnl ====================================================================================

0 commit comments

Comments
 (0)