Changeset 7424

Timestamp:

10/14/2013 11:28:38 PM (13 years ago)

Author:

boonebgorges

Message:

Better backward compatibility for tests configuration

Improved support for the old WP_TESTS_DIR environment variable, in particular
when pointing this environment variable toward the new develop.svn.wordpress.org
configuration.

See #5200

File:

• trunk/tests/bootstrap.php (modified) (1 diff)

trunk/tests/bootstrap.php

@@ -15 +15 @@
 if ( getenv( 'WP_TESTS_DIR' ) ) {
         define( 'WP_TESTS_DIR', getenv( 'WP_TESTS_DIR' ) );
-        define( 'WP_TESTS_CONFIG_PATH', WP_TESTS_DIR . '/wp-tests-config.php' );
-}
-else {
+        define( 'WP_ROOT_DIR', WP_TESTS_DIR );
+} else {
         define( 'WP_ROOT_DIR', dirname( dirname( dirname( dirname( dirname( __DIR__ ) ) ) ) ) );
         define( 'WP_TESTS_DIR', WP_ROOT_DIR . '/tests/phpunit' );
-        define( 'WP_TESTS_CONFIG_PATH', WP_ROOT_DIR . '/wp-tests-config.php' );
 }
 
-if ( ! file_exists( WP_TESTS_DIR . '/includes/functions.php' ) )
+// Based on the tests directory, look for a config file
+if ( file_exists( WP_ROOT_DIR . '/wp-tests-config.php' ) ) {
+        // Standard develop.svn.wordpress.org setup
+        define( 'WP_TESTS_CONFIG_PATH', WP_ROOT_DIR . '/wp-tests-config.php' );
+
+} else if ( file_exists( WP_TESTS_DIR . '/wp-tests-config.php' ) ) {
+        // Legacy unit-test.svn.wordpress.org setup
+        define( 'WP_TESTS_CONFIG_PATH', WP_TESTS_DIR . '/wp-tests-config.php' );
+
+} else if ( file_exists( dirname( dirname( WP_TESTS_DIR ) ) . '/wp-tests-config.php' ) ) {
+        // Environment variable exists and points to tests/phpunit of
+        // develop.svn.wordpress.org setup
+        define( 'WP_TESTS_CONFIG_PATH', dirname( dirname( WP_TESTS_DIR ) ) . '/wp-tests-config.php' );
+
+} else {
+        die( "wp-tests-config.php could not be found.\n" );
+}
+
+if ( ! file_exists( WP_TESTS_DIR . '/includes/functions.php' ) ) {
         die( "The WordPress PHPUnit test suite could not be found.\n" );
+}
 
 require_once WP_TESTS_DIR . '/includes/functions.php';