Manually merge changes from clutton

gliaskos · Nov 28, 2016 · 5cf6634 · 5cf6634
1 parent dd3bfcf
commit 5cf6634
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/www/chromium/Makefile b/www/chromium/Makefile
@@ -107,9 +107,8 @@ SUB_LIST+=	COMMENT="${COMMENT}"
 OPTIONS_DEFINE=	CODECS GCONF KERBEROS DRIVER
 CODECS_DESC=	Compile and enable patented codecs like H.264
 DRIVER_DESC=	Install chromedriver
-OPTIONS_MULTI=		AUDIO
-OPTIONS_MULTI_AUDIO=	ALSA PULSEAUDIO
-OPTIONS_GROUP=		TESTS
+OPTIONS_GROUP=		AUDIO TESTS
+OPTIONS_GROUP_AUDIO=	ALSA PULSEAUDIO
 OPTIONS_GROUP_TESTS=	DEBUG TEST
 
 OPTIONS_DEFAULT=	CODECS GCONF KERBEROS ALSA PULSEAUDIO

diff --git a/www/chromium/Makefile.tests b/www/chromium/Makefile.tests
@@ -1,10 +1,13 @@
 #$FreeBSD$
-#telemetry_unittests : unknown ninja target
+# TODO(clutton): remove this comment when more tests would be fixed
+# DBUS: env DBUS_FATAL_WARNINGS=0
+# ubuntu builds dbus with DBUS_DISABLE_CHECKS and chromium assumes that this
+# behaviour is normal (it is not anyway, check the dbus maillist).
+# sync_unit_tests
 TEST_TARGETS=	base_unittests \
 		crypto_unittests \
 		cacheinvalidation_unittests \
 		gpu_unittests \
-		sync_unit_tests \
 		printing_unittests \
 		sql_unittests \
 		content_unittests \