Bug 1295480 - Move --enable-ipdl-tests to python configure. r=chmanchester
authorMike Hommey <mh+mozilla@glandium.org>
Tue, 16 Aug 2016 14:01:02 +0900
changeset 309748 c581506cbf7af8c571261fc4bab33df2cb4044a3
parent 309747 be715554b15e82e0b182aedb338c651c0f3661f1
child 309749 60708763cd62988e199e956893f2dcc270eb2e2c
push id20333
push userkwierso@gmail.com
push dateThu, 18 Aug 2016 00:26:40 +0000
treeherderfx-team@11c94ec980d6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerschmanchester
bugs1295480
milestone51.0a1
Bug 1295480 - Move --enable-ipdl-tests to python configure. r=chmanchester
build/moz.configure/old.configure
old-configure.in
toolkit/moz.configure
toolkit/xre/moz.build
--- a/build/moz.configure/old.configure
+++ b/build/moz.configure/old.configure
@@ -185,17 +185,16 @@ def old_configure_options(*options):
     '--enable-gio',
     '--enable-gnomeui',
     '--enable-gold',
     '--enable-hardware-aec-ns',
     '--enable-icf',
     '--enable-install-strip',
     '--enable-ion',
     '--enable-ios-target',
-    '--enable-ipdl-tests',
     '--enable-jitspew',
     '--enable-libjpeg-turbo',
     '--enable-libproxy',
     '--enable-llvm-hacks',
     '--enable-logrefcnt',
     '--enable-maintenance-service',
     '--enable-memory-sanitizer',
     '--enable-mobile-optimize',
--- a/old-configure.in
+++ b/old-configure.in
@@ -2875,32 +2875,16 @@ dnl = Include install tracking on Androi
 dnl ========================================================
 if test -n "$MOZ_INSTALL_TRACKING"; then
     if test -z "$MOZ_ADJUST_SDK_KEY"; then
         AC_MSG_ERROR([Must specify --with-adjust-sdk-keyfile when MOZ_INSTALL_TRACKING is defined!])
     fi
 fi
 
 dnl ========================================================
-dnl = Enable IPDL's "expensive" unit tests
-dnl ========================================================
-MOZ_IPDL_TESTS=
-
-MOZ_ARG_ENABLE_BOOL(ipdl-tests,
-[  --enable-ipdl-tests     Enable expensive IPDL tests],
-    MOZ_IPDL_TESTS=1,
-    MOZ_IPDL_TESTS=)
-
-if test -n "$MOZ_IPDL_TESTS"; then
-    AC_DEFINE(MOZ_IPDL_TESTS)
-fi
-
-AC_SUBST(MOZ_IPDL_TESTS)
-
-dnl ========================================================
 dnl = Disable building dbm
 dnl ========================================================
 MOZ_ARG_DISABLE_BOOL(dbm,
 [  --disable-dbm           Disable building dbm],
     NSS_DISABLE_DBM=1,
     NSS_DISABLE_DBM=)
 
 dnl ========================================================
--- a/toolkit/moz.configure
+++ b/toolkit/moz.configure
@@ -551,8 +551,15 @@ option('--enable-websms-backend', defaul
        help='Enable WebSMS backend')
 
 @depends_if('--enable-websms-backend')
 def websms_backend(value):
     return True
 
 set_config('MOZ_WEBSMS_BACKEND', websms_backend)
 set_define('MOZ_WEBSMS_BACKEND', websms_backend)
+
+# Enable IPDL's "expensive" unit tests
+# ==============================================================
+option('--enable-ipdl-tests', help='Enable expensive IPDL tests')
+
+set_config('MOZ_IPDL_TESTS',
+           depends_if('--enable-ipdl-tests')(lambda _: True))
--- a/toolkit/xre/moz.build
+++ b/toolkit/xre/moz.build
@@ -177,8 +177,11 @@ if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']
 
 DEFINES['TOPOBJDIR'] = TOPOBJDIR
 FINAL_TARGET_PP_FILES += [
     'platform.ini'
 ]
 
 if CONFIG['GNU_CXX']:
     CXXFLAGS += ['-Wno-error=shadow']
+
+if CONFIG['MOZ_IPDL_TESTS']:
+    DEFINES['MOZ_IPDL_TESTS'] = True