Changeset 8415

Timestamp:

05/12/2014 08:02:21 PM (10 years ago)

Author:

boonebgorges

Message:

Rework the way that the WP tests directory is inferred during test bootstrap, to support WP_DEVELOP_DIR

This provides greater flexibility, and better compatibility with other projects.

Fixes #5376

File:

• trunk/tests/phpunit/includes/define-constants.php (modified) (1 diff)

trunk/tests/phpunit/includes/define-constants.php

@@ -12 +12 @@
 
 /**
- * In the pre-develop.svn WP development environment, an environmental bash
- * variable would be set to run PHP Unit tests. However, this has been done
- * away with in a post-develop.svn world. We'll still check if this variable
- * is set for backwards compat.
+ * Determine where the WP test suite lives. Three options are supported:
+ *
+ * - Define a WP_DEVELOP_DIR environment variable, which points to a checkout
+ *   of the develop.svn.wordpress.org repository (this is recommended)
+ * - Define a WP_TESTS_DIR environment variable, which points to a checkout of
+ *   WordPress test suite
+ * - Assume that we are inside of a develop.svn.wordpress.org setup, and walk
+ *   up the directory tree
  */
-if ( getenv( 'WP_TESTS_DIR' ) ) {
+if ( false !== getenv( 'WP_TESTS_DIR' ) ) {
     define( 'WP_TESTS_DIR', getenv( 'WP_TESTS_DIR' ) );
     define( 'WP_ROOT_DIR', WP_TESTS_DIR );
 } else {
-    define( 'WP_ROOT_DIR', dirname( dirname( dirname( dirname( dirname( dirname( dirname( __DIR__ ) ) ) ) ) ) ) );
+    // Support WP_DEVELOP_DIR, as used by some plugins
+    if ( false !== getenv( 'WP_DEVELOP_DIR' ) ) {
+        define( 'WP_TESTS_DIR', getenv( 'WP_DEVELOP_DIR' ) );
+    } else {
+        define( 'WP_ROOT_DIR', dirname( dirname( dirname( dirname( dirname( dirname( dirname( __DIR__ ) ) ) ) ) ) ) );
+    }
+
     define( 'WP_TESTS_DIR', WP_ROOT_DIR . '/tests/phpunit' );
 }