tests: Shorten how long daemon tests take to run

We split out some of the check-daemon tests that take a long time to
run, and also reduce how long we wait for the daemon to start up. This
should make the CI process quicker.

diff --git a/Makefile.am b/Makefile.am
index 546ea53229980ec3a5226c8775d1b07cb7e30ba0..09e510a215be08283621e78a98b3fd473db40bbd 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -109,6 +109,9 @@ dist-hook:
 check-daemon:
        $(MAKE) -C src check-daemon
 
+check-daemon-long:
+       $(MAKE) -C src check-daemon-long
+
 .PHONY: homepage distcleancheck doxygen
 
 # see git-version-gen

diff --git a/src/Makefile.am b/src/Makefile.am
index 2dbb4563b87517771a958d7b8db86bedae24ace7..89f5322783a06e8d62a5f5693aac801f79dd69bb 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -297,12 +297,15 @@ TESTS_norun = \
 
 # These tests need a running pulseaudio daemon
 TESTS_daemon = \
-               connect-stress \
                extended-test \
                passthrough-test \
-               interpol-test \
                sync-playback
 
+# These tests need a running daemon and take a while to complete
+TESTS_daemon_long = \
+               connect-stress \
+               interpol-test
+
 if !OS_IS_WIN32
 TESTS_default += \
                sigbus-test \
@@ -348,7 +351,7 @@ TESTS_ENVIRONMENT=MAKE_CHECK=1
 TESTS = $(TESTS_default)
 
 if BUILD_TESTS_DEFAULT
-noinst_PROGRAMS = $(TESTS_default) $(TESTS_norun) $(TESTS_daemon)
+noinst_PROGRAMS = $(TESTS_default) $(TESTS_norun) $(TESTS_daemon) $(TESTS_daemon_long)
 else
 check_PROGRAMS = $(TESTS_default) $(TESTS_norun)
 endif
@@ -356,6 +359,9 @@ endif
 check-daemon: $(TESTS_daemon)
        PATH=$(builddir):${PATH} $(top_srcdir)/src/tests/test-daemon.sh $(TESTS_daemon)
 
+check-daemon-long: $(TESTS_daemon_long)
+       PATH=$(builddir):${PATH} $(top_srcdir)/src/tests/test-daemon.sh $(TESTS_daemon_long)
+
 else
 TESTS_ENVIRONMENT=
 TESTS =
@@ -367,6 +373,8 @@ check-daemon:
        @echo "Pass option \"--enable-tests\" to configure and install \"check\" library properly!"
        false
 
+check-daemon-long: check-daemon
+
 endif
 
 core_util_test_SOURCES = tests/core-util-test.c

diff --git a/src/tests/test-daemon.sh b/src/tests/test-daemon.sh
index c1907a1e56199567fc22306564b7cc1c11eba302..2b64ceaf50a19e7b8f30c0196b7654c8c00c038e 100755 (executable)
--- a/src/tests/test-daemon.sh
+++ b/src/tests/test-daemon.sh
@@ -48,7 +48,7 @@ pulseaudio -n \
         &
 
 # wait a few seconds to let the daemon start!
-sleep 5
+sleep 2
 
 unset DISPLAY