Changeset 47496

Timestamp:

03/24/2020 12:18:29 AM (5 years ago)

Author:

azaozz

Message:

Build/Test Tools: Fix PHPUnit bootstrap to install WP from /build when tests are run with npm run test, grunt test, grunt then phpunit, etc.

Fixes #49663.

Location:

trunk/tests/phpunit/includes

Files:

• bootstrap.php (modified) (1 diff)
• install.php (modified) (1 diff)

trunk/tests/phpunit/includes/bootstrap.php

@@ -98 +98 @@
 
 if ( '1' !== getenv( 'WP_TESTS_SKIP_INSTALL' ) ) {
-    system( WP_PHP_BINARY . ' ' . escapeshellarg( __DIR__ . '/install.php' ) . ' ' . escapeshellarg( $config_file_path ) . ' ' . $multisite, $retval );
+    $core_tests = ( defined( 'WP_RUN_CORE_TESTS' ) && WP_RUN_CORE_TESTS ) ? 'run_core_tests' : 'no_core_tests';
+    $ms_tests   = $multisite ? 'run_ms_tests' : 'no_ms_tests';
+
+    system( WP_PHP_BINARY . ' ' . escapeshellarg( __DIR__ . '/install.php' ) . ' ' . escapeshellarg( $config_file_path ) . ' ' . $ms_tests . ' ' . $core_tests, $retval );
     if ( 0 !== $retval ) {
         exit( $retval );

trunk/tests/phpunit/includes/install.php

@@ -8 +8 @@
 
 $config_file_path = $argv[1];
-$multisite        = ! empty( $argv[2] );
+$multisite        = in_array( 'run_ms_tests', $argv, true );
+
+if ( ! defined( 'WP_RUN_CORE_TESTS' ) && in_array( 'run_core_tests', $argv, true ) ) {
+    define( 'WP_RUN_CORE_TESTS', true );
+}
 
 define( 'WP_INSTALLING', true );