sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.

Browse Source 
Fixes #49663.

git-svn-id: https://develop.svn.wordpress.org/trunk@47496 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Andrew Ozz 2020-03-24 00:18:29 +00:00
parent def0da1bbe
commit 679fbbc422
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tests/phpunit/includes/bootstrap.php
View File

@ -97,7 +97,10 @@ if ( file_exists( DIR_TESTDATA . '/themedir1' ) ) {
} }
if ( '1' !== getenv( 'WP_TESTS_SKIP_INSTALL' ) ) { 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 ) { if ( 0 !== $retval ) {
exit( $retval ); exit( $retval );
} }

6
tests/phpunit/includes/install.php
View File

@ -7,7 +7,11 @@
error_reporting( E_ALL & ~E_DEPRECATED & ~E_STRICT ); error_reporting( E_ALL & ~E_DEPRECATED & ~E_STRICT );
$config_file_path = $argv[1]; $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 ); define( 'WP_INSTALLING', true );
require_once $config_file_path; require_once $config_file_path;