[pulseaudio-commits] [Git][pulseaudio/pulseaudio][master] 3 commits: build-sys: Add the ability to disable maintainer mode

[Arun Raghavan]

Arun Raghavan pushed to branch master at PulseAudio / pulseaudio


Commits:
39bc380c by Arun Raghavan at 2019-01-16T04:09:24Z
build-sys: Add the ability to disable maintainer mode

This allows us to disable automatically updating build system files in
case things change. This is desirable in the common case, but not
necessarily for CI, where we want the ability to take a build directory
as an artifact from one stage to the next (i.e. into a fresh checkout).

- - - - -
24c389c8 by Arun Raghavan at 2019-01-16T04:09:24Z
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.

- - - - -
9e0aa31f by Arun Raghavan at 2019-01-16T04:09:24Z
pactl: Fix some corner cases when setting sink formats

Mostly deals with failure more gracefully, and NULL-initialises the
format array for safety.

- - - - -


5 changed files:

- Makefile.am
- configure.ac
- src/Makefile.am
- src/tests/test-daemon.sh
- src/utils/pactl.c


Changes:

=====================================
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


=====================================
configure.ac
=====================================
@@ -28,6 +28,8 @@ AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_AUX_DIR([build-aux])
 AM_INIT_AUTOMAKE([foreign 1.11 -Wall -Wno-portability subdir-objects silent-rules color-tests dist-xz tar-ustar])
 
+AM_MAINTAINER_MODE([enable])
+
 AS_IF([! test -n "$VERSION"], [
    AC_MSG_ERROR([git-version-gen failed])
 ])


=====================================
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


=====================================
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
 


=====================================
src/utils/pactl.c
=====================================
@@ -1045,7 +1045,7 @@ static void source_output_toggle_mute_callback(pa_context *c, const pa_source_ou
 #define MAX_FORMATS 256
 
 static void set_sink_formats(pa_context *c, uint32_t sink, const char *str) {
-    pa_format_info *f_arr[MAX_FORMATS];
+    pa_format_info *f_arr[MAX_FORMATS] = { 0, };
     char *format = NULL;
     const char *state = NULL;
     int i = 0;
@@ -1072,13 +1072,13 @@ static void set_sink_formats(pa_context *c, uint32_t sink, const char *str) {
 done:
     if (format)
         pa_xfree(format);
-    while(i--)
+    while (f_arr[i] && i--)
         pa_format_info_free(f_arr[i]);
 
     return;
 
 error:
-    while(i--)
+    while (f_arr[i] && i--)
         pa_format_info_free(f_arr[i]);
     quit(1);
     goto done;



View it on GitLab: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/compare/2e755f012e31ac819a10cf2b042da1104d08478a...9e0aa31f0a0d0c29ed0108dc1d6fa9e4d557b90f

-- 
View it on GitLab: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/compare/2e755f012e31ac819a10cf2b042da1104d08478a...9e0aa31f0a0d0c29ed0108dc1d6fa9e4d557b90f
You're receiving this email because of your account on gitlab.freedesktop.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.freedesktop.org/archives/pulseaudio-commits/attachments/20190116/35170dc9/attachment-0001.html>