Changeset 44512

Timestamp:

01/09/2019 11:13:03 AM (6 years ago)

Author:

pento

Message:

Tests: Revert [44509].

This commit causes Travis to fail.

See #45863.

Location:

trunk

Files:

• tests/phpunit/includes/bootstrap.php (modified) (1 diff)
• wp-tests-config-sample.php (modified) (1 diff)

trunk/tests/phpunit/includes/bootstrap.php

@@ -36 +36 @@
 require_once $config_file_path;
 require_once dirname( __FILE__ ) . '/functions.php';
+
+if ( defined( 'WP_RUN_CORE_TESTS' ) && WP_RUN_CORE_TESTS && file_exists( ABSPATH . '_index.php' ) ) {
+    // Perhaps add more documentation about having to run `grunt` before running tests after changing code.
+    echo "ERROR: ABSPATH must point to the `build` directory, not the `src` directory. Please update your wp-tests-config.php file.\n";
+    exit( 1 );
+}
 
 tests_reset__SERVER();

trunk/wp-tests-config-sample.php

@@ -2 +2 @@
 
 /* Path to the WordPress codebase you'd like to test. Add a forward slash in the end. */
-define( 'ABSPATH', dirname( __FILE__ ) . '/src/' );
+if ( defined( 'WP_RUN_CORE_TESTS' ) && WP_RUN_CORE_TESTS ) {
+    define( 'ABSPATH', dirname( __FILE__ ) . '/build/' );
+} else {
+    define( 'ABSPATH', dirname( __FILE__ ) . '/src/' );
+}
 
 /*