diff options
| author | Arun Raghavan <arun@arunraghavan.net> | 2018-10-13 11:01:45 +0530 |
|---|---|---|
| committer | Arun Raghavan <arun@arunraghavan.net> | 2019-01-16 09:39:24 +0530 |
| commit | 24c389c8aa3b0291837e04ad60a39882e6eae999 (patch) | |
| tree | e803b5f19752f8787504585e11702ad4046a1b53 | |
| parent | 39bc380c129ca36fbc94e41707d58b138b00876e (diff) | |
| download | pulseaudio-24c389c8aa3b0291837e04ad60a39882e6eae999.tar.gz | |
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.
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | src/Makefile.am | 14 | ||||
| -rwxr-xr-x | src/tests/test-daemon.sh | 2 |
3 files changed, 15 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index 546ea532..09e510a2 100644 --- 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 2dbb4563..89f53227 100644 --- 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 c1907a1e..2b64ceaf 100755 --- 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 |