Merge "Don't modify $wgHooks on language object construction"

[lhc/web/wiklou.git] / tests / phpunit / phpunit.php

diff --git a/tests/phpunit/phpunit.php b/tests/phpunit/phpunit.php
index 0ae0b21..81dc412 100755 (executable)
--- a/tests/phpunit/phpunit.php
+++ b/tests/phpunit/phpunit.php
@@ -254,14 +254,6 @@ class PHPUnitMaintClass extends Maintenance {
 $maintClass = 'PHPUnitMaintClass';
 require RUN_MAINTENANCE_IF_MAIN;
 
-// Prevent segfault when we have lots of unit tests (bug 62623)
-if ( version_compare( PHP_VERSION, '5.4.0', '<' ) ) {
-       register_shutdown_function( function () {
-               gc_collect_cycles();
-               gc_disable();
-       } );
-}
-
 $ok = false;
 
 if ( class_exists( 'PHPUnit_TextUI_Command' ) ) {
@@ -302,4 +294,8 @@ if ( $puVersion !== '@package_version@' && version_compare( $puVersion, '3.7.0',
        exit( 1 );
 }
 
+echo defined( 'HHVM_VERSION' ) ?
+       'Using HHVM ' . HHVM_VERSION . ' (' . PHP_VERSION . ")\n" :
+       'Using PHP ' . PHP_VERSION . "\n";
+
 PHPUnit_TextUI_Command::main();