Bug 1189526 - Add screentopng to mochitest test archive on Gtk+3 builds. r=mshal
authorMike Hommey <mh+mozilla@glandium.org>
Fri, 31 Jul 2015 06:52:13 +0900
changeset 287420 d8c8695f0d5419831ad4e5fc31ae8eb83b6b6fa3
parent 287419 3378f3a3394482ae9f6a0dcab1852e44fdeeac65
child 287421 388cee5d9c5d461e8c55b75af225997172e71bff
push id5067
push userraliiev@mozilla.com
push dateMon, 21 Sep 2015 14:04:52 +0000
treeherdermozilla-beta@14221ffe5b2f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmshal
bugs1189526
milestone42.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1189526 - Add screentopng to mochitest test archive on Gtk+3 builds. r=mshal
testing/mochitest/Makefile.in
--- a/testing/mochitest/Makefile.in
+++ b/testing/mochitest/Makefile.in
@@ -40,19 +40,21 @@ endif
 ifeq ($(OS_ARCH),Darwin)
 TEST_HARNESS_BINS += fix_macosx_stack.py
 endif
 
 ifeq ($(OS_ARCH),Linux)
 TEST_HARNESS_BINS += fix_linux_stack.py
 endif
 
-ifeq (gtk2_1,$(MOZ_WIDGET_TOOLKIT)_$(MOZ_X11))
+ifdef MOZ_X11
+ifneq (,$(filter gtk%,$(MOZ_WIDGET_TOOLKIT)))
 TEST_HARNESS_BINS += screentopng
 endif
+endif
 
 ifeq (windows,$(MOZ_WIDGET_TOOLKIT))
 TEST_HARNESS_BINS += screenshot$(BIN_SUFFIX)
 endif
 
 ifdef MOZ_DMD
 TEST_HARNESS_BINS += \
   dmd.py \