Changeset 37266

Timestamp:

04/20/2016 04:51:58 PM (8 years ago)

Author:

jeremyfelt

Message:

Tests: Allow override of MULTISITE and SUBDOMAIN_INSTALL constants

Props rmccue.
Fixes #36567.

File:

• trunk/tests/phpunit/includes/bootstrap.php (modified) (2 diffs)

trunk/tests/phpunit/includes/bootstrap.php

@@ -43 +43 @@
 $PHP_SELF = $GLOBALS['PHP_SELF'] = $_SERVER['PHP_SELF'] = '/index.php';
 
-if ( "1" == getenv( 'WP_MULTISITE' ) ||
-    ( defined( 'WP_TESTS_MULTISITE') && WP_TESTS_MULTISITE ) ) {
-    $multisite = true;
-} else {
-    $multisite = false;
-}
+// Should we run in multisite mode?
+$multisite = '1' == getenv( 'WP_MULTISITE' );
+$multisite = $multisite || ( defined( 'WP_TESTS_MULTISITE') && WP_TESTS_MULTISITE );
+$multisite = $multisite || ( defined( 'MULTISITE' ) && MULTISITE );
 
 // Override the PHPMailer
@@ -58 +56 @@
 if ( $multisite ) {
     echo "Running as multisite..." . PHP_EOL;
-    define( 'MULTISITE', true );
-    define( 'SUBDOMAIN_INSTALL', false );
+    defined( 'MULTISITE' ) or define( 'MULTISITE', true );
+    defined( 'SUBDOMAIN_INSTALL' ) or define( 'SUBDOMAIN_INSTALL', false );
     $GLOBALS['base'] = '/';
 } else {