Bug 1466473 - [Wayland] Run glxtest.cpp on X11 enabled builds, r=lsalzman
authorMartin Stransky <stransky@redhat.com>
Mon, 04 Jun 2018 11:19:09 +0200
changeset 475553 d07b0224222608011600346921ed2fe0a4fae542
parent 475552 721c4f5f0fe78f00c41addab8006a8df84763566
child 475554 0beab09f80582c3a68471d09b9df8ebb07293b51
push id9374
push userjlund@mozilla.com
push dateMon, 18 Jun 2018 21:43:20 +0000
treeherdermozilla-beta@160e085dfb0b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerslsalzman
bugs1466473
milestone62.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 1466473 - [Wayland] Run glxtest.cpp on X11 enabled builds, r=lsalzman Run glxtest.cpp (async GL detection tool) on X11 enabled builds, detect GL setup on GLX backend (X11 only builds) and also on Wayland enabled builds. MozReview-Commit-ID: GbKjofV8NS2
toolkit/xre/moz.build
--- a/toolkit/xre/moz.build
+++ b/toolkit/xre/moz.build
@@ -116,17 +116,17 @@ UNIFIED_SOURCES += [
 # they pull in OS X system headers.
 # nsEmbedFunctions.cpp cannot be built in unified mode because it pulls in X11 headers.
 SOURCES += [
     'nsAppRunner.cpp',
     'nsEmbedFunctions.cpp',
     'ProfileReset.cpp',
 ]
 
-if CONFIG['MOZ_GL_DEFAULT_PROVIDER'] == 'GLX':
+if CONFIG['MOZ_X11']:
     UNIFIED_SOURCES += [
         'glxtest.cpp',
     ]
 
 if CONFIG['MOZ_INSTRUMENT_EVENT_LOOP']:
     UNIFIED_SOURCES += [
         'EventTracer.cpp',
     ]
@@ -142,17 +142,17 @@ if CONFIG['MOZ_PDF_PRINTING']:
     LOCAL_INCLUDES += [
         '../components/printingui',
     ]
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
 
-if CONFIG['MOZ_GL_DEFAULT_PROVIDER'] == 'GLX':
+if CONFIG['MOZ_X11']:
     DEFINES['USE_GLX_TEST'] = True
 
 for var in ('MOZ_APP_NAME', 'MOZ_APP_BASENAME', 'MOZ_APP_DISPLAYNAME',
             'MOZ_APP_VERSION', 'OS_TARGET', 'MOZ_WIDGET_TOOLKIT'):
     DEFINES[var] = '"%s"' % CONFIG[var]
 
 if CONFIG['MOZ_UPDATER'] and CONFIG['MOZ_WIDGET_TOOLKIT'] != 'android':
     DEFINES['MOZ_UPDATER'] = True