From 0137c23f8df4977c5af4e64d2f30e78c96b9ed05 Mon Sep 17 00:00:00 2001
From: Gary Pendergast <pento@git.wordpress.org>
Date: Wed, 9 Jan 2019 10:13:13 +0000
Subject: [PATCH] Build/Tests: Default to running unit tests from `src`.

This is the actual commit, unlike [44508], which was not.

Props atimmer.
See #44492.
Fixes #45863.


git-svn-id: https://develop.svn.wordpress.org/trunk@44509 602fd350-edb4-49c9-b593-d223f7449a82
---
 tests/phpunit/includes/bootstrap.php | 6 ------
 wp-tests-config-sample.php           | 6 +-----
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/tests/phpunit/includes/bootstrap.php b/tests/phpunit/includes/bootstrap.php
index eebc649efa..47c59528be 100644
--- a/tests/phpunit/includes/bootstrap.php
+++ b/tests/phpunit/includes/bootstrap.php
@@ -36,12 +36,6 @@ if ( ! is_readable( $config_file_path ) ) {
 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();
 
 define( 'WP_TESTS_TABLE_PREFIX', $table_prefix );
diff --git a/wp-tests-config-sample.php b/wp-tests-config-sample.php
index 2f6c515912..5368d89e1e 100644
--- a/wp-tests-config-sample.php
+++ b/wp-tests-config-sample.php
@@ -1,11 +1,7 @@
 <?php
 
 /* Path to the WordPress codebase you'd like to test. Add a forward slash in the end. */
-if ( defined( 'WP_RUN_CORE_TESTS' ) && WP_RUN_CORE_TESTS ) {
-	define( 'ABSPATH', dirname( __FILE__ ) . '/build/' );
-} else {
-	define( 'ABSPATH', dirname( __FILE__ ) . '/src/' );
-}
+define( 'ABSPATH', dirname( __FILE__ ) . '/src/' );
 
 /*
  * Path to the theme to test with.