From 3d6c86496e4f7a1504b9b418664ffe4db87d7cb1 Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Tue, 29 Sep 2015 10:50:30 +0200 Subject: [PATCH] [ci] Display fastest results first when running tests in parallel --- .travis.yml | 6 +- phpunit | 68 +++++++++++-------- .../RecursiveDirectoryIteratorTest.php | 8 +-- 3 files changed, 46 insertions(+), 36 deletions(-) diff --git a/.travis.yml b/.travis.yml index 31ec53de6e..a15d8d4c25 100644 --- a/.travis.yml +++ b/.travis.yml @@ -44,7 +44,7 @@ install: - if [ "$deps" != "no" ]; then php .travis.php $TRAVIS_COMMIT_RANGE $TRAVIS_BRANCH $COMPONENTS; fi; script: - - if [ "$deps" = "no" ]; then echo "$COMPONENTS" | parallel --gnu --keep-order 'echo -e "\\nRunning {} tests"; $PHPUNIT --exclude-group tty,benchmark,intl-data {}'; fi; + - if [ "$deps" = "no" ]; then echo "$COMPONENTS" | parallel --gnu 'echo -e "\\nRunning {} tests"; $PHPUNIT --exclude-group tty,benchmark,intl-data {}'; fi; - if [ "$deps" = "no" ]; then echo -e "\\nRunning tests requiring tty"; $PHPUNIT --group tty; fi; - - if [ "$deps" = "high" ]; then echo "$COMPONENTS" | parallel --gnu --keep-order -j10% 'echo -e "\\nRunning {} tests"; cd {}; composer --prefer-source update; $PHPUNIT --exclude-group tty,benchmark,intl-data'; fi; - - if [ "$deps" = "low" ]; then echo "$COMPONENTS" | parallel --gnu --keep-order -j10% 'echo -e "\\nRunning {} tests"; cd {}; composer --prefer-source --prefer-lowest --prefer-stable update; $PHPUNIT --exclude-group tty,benchmark,intl-data'; fi; + - if [ "$deps" = "high" ]; then echo "$COMPONENTS" | parallel --gnu -j10% 'echo -e "\\nRunning {} tests"; cd {}; composer --prefer-source update; $PHPUNIT --exclude-group tty,benchmark,intl-data'; fi; + - if [ "$deps" = "low" ]; then echo "$COMPONENTS" | parallel --gnu -j10% 'echo -e "\\nRunning {} tests"; cd {}; composer --prefer-source --prefer-lowest --prefer-stable update; $PHPUNIT --exclude-group tty,benchmark,intl-data'; fi; diff --git a/phpunit b/phpunit index cc1bbc8e83..7e1f519a26 100755 --- a/phpunit +++ b/phpunit @@ -33,13 +33,13 @@ $exit = 0; if (isset($argv[1]) && 'symfony' === $argv[1]) { // Find Symfony components in plain php for Windows portability - $finder = new RecursiveDirectoryIterator('src/Symfony', FilesystemIterator::KEY_AS_FILENAME | FilesystemIterator::UNIX_PATHS); + $finder = new RecursiveDirectoryIterator(__DIR__.'/src/Symfony', FilesystemIterator::KEY_AS_FILENAME | FilesystemIterator::UNIX_PATHS); $finder = new RecursiveIteratorIterator($finder); $finder->setMaxDepth(3); array_shift($cmd); $cmd[0] = "php $PHPUNIT_DIR/phpunit-$PHPUNIT_VERSION/phpunit --colors=always"; - $procs = array(); + $runningProcs = array(); foreach ($finder as $file => $fileInfo) { if ('phpunit.xml.dist' === $file) { @@ -50,7 +50,7 @@ if (isset($argv[1]) && 'symfony' === $argv[1]) { $c = escapeshellarg($component); if ($proc = proc_open(implode(' ', $cmd)." $c > $c/phpunit.stdout 2> $c/phpunit.stderr", array(), $pipes)) { - $procs[$component] = $proc; + $runningProcs[$component] = $proc; } else { $exit = 1; echo "\033[41mKO\033[0m $component\n\n"; @@ -59,7 +59,7 @@ if (isset($argv[1]) && 'symfony' === $argv[1]) { } // Fixes for colors support on appveyor - // See http://help.appveyor.com/discussions/suggestions/197-support-ansi-color-codes + // See https://github.com/appveyor/ci/issues/373 $colorFixes = array( array("S\033[0m\033[0m\033[36m\033[1mS", "E\033[0m\033[0m\033[31m\033[1mE", "I\033[0m\033[0m\033[33m\033[1mI", "F\033[0m\033[0m\033[41m\033[37mF"), array("SS", "EE", "II", "FF"), @@ -67,36 +67,46 @@ if (isset($argv[1]) && 'symfony' === $argv[1]) { $colorFixes[0] = array_merge($colorFixes[0], $colorFixes[0]); $colorFixes[1] = array_merge($colorFixes[1], $colorFixes[1]); - foreach ($procs as $component => $proc) { - $procStatus = proc_close($proc); - - foreach (array('out', 'err') as $file) { - $file = "$component/phpunit.std$file"; - - if ('\\' === DIRECTORY_SEPARATOR) { - $h = fopen($file, 'rb'); - while (false !== $line = fgets($h)) { - echo str_replace($colorFixes[0], $colorFixes[1], preg_replace( - '/(\033\[[0-9]++);([0-9]++m)(?:(.)(\033\[0m))?/', - "$1m\033[$2$3$4$4", - $line - )); - } - fclose($h); - } else { - readfile($file); + while ($runningProcs) { + usleep(300000); + $terminatedProcs = array(); + foreach ($runningProcs as $component => $proc) { + $procStatus = proc_get_status($proc); + if (!$procStatus['running']) { + $terminatedProcs[$component] = $procStatus['exitcode']; + unset($runningProcs[$component]); + proc_close($proc); } - unlink($file); } - if ($procStatus) { - $exit = 1; - echo "\033[41mKO\033[0m $component\n\n"; - } else { - echo "\033[32mOK\033[0m $component\n\n"; + foreach ($terminatedProcs as $component => $procStatus) { + foreach (array('out', 'err') as $file) { + $file = "$component/phpunit.std$file"; + + if ('\\' === DIRECTORY_SEPARATOR) { + $h = fopen($file, 'rb'); + while (false !== $line = fgets($h)) { + echo str_replace($colorFixes[0], $colorFixes[1], preg_replace( + '/(\033\[[0-9]++);([0-9]++m)(?:(.)(\033\[0m))?/', + "$1m\033[$2$3$4$4", + $line + )); + } + fclose($h); + } else { + readfile($file); + } + unlink($file); + } + + if ($procStatus) { + $exit = 1; + echo "\033[41mKO\033[0m $component\n\n"; + } else { + echo "\033[32mOK\033[0m $component\n\n"; + } } } - } elseif (!isset($argv[1]) || 'install' !== $argv[1]) { // Run regular phpunit in a subprocess diff --git a/src/Symfony/Component/Finder/Tests/Iterator/RecursiveDirectoryIteratorTest.php b/src/Symfony/Component/Finder/Tests/Iterator/RecursiveDirectoryIteratorTest.php index b59d0d6f27..3a3ddc4dd4 100644 --- a/src/Symfony/Component/Finder/Tests/Iterator/RecursiveDirectoryIteratorTest.php +++ b/src/Symfony/Component/Finder/Tests/Iterator/RecursiveDirectoryIteratorTest.php @@ -21,7 +21,7 @@ class RecursiveDirectoryIteratorTest extends IteratorTestCase public function testRewindOnFtp() { try { - $i = new RecursiveDirectoryIterator('ftp://ftp.mozilla.org/', \RecursiveDirectoryIterator::SKIP_DOTS); + $i = new RecursiveDirectoryIterator('ftp://speedtest.tele2.net/', \RecursiveDirectoryIterator::SKIP_DOTS); } catch (\UnexpectedValueException $e) { $this->markTestSkipped('Unsupported stream "ftp".'); } @@ -37,14 +37,14 @@ class RecursiveDirectoryIteratorTest extends IteratorTestCase public function testSeekOnFtp() { try { - $i = new RecursiveDirectoryIterator('ftp://ftp.mozilla.org/', \RecursiveDirectoryIterator::SKIP_DOTS); + $i = new RecursiveDirectoryIterator('ftp://speedtest.tele2.net/', \RecursiveDirectoryIterator::SKIP_DOTS); } catch (\UnexpectedValueException $e) { $this->markTestSkipped('Unsupported stream "ftp".'); } $contains = array( - 'ftp://ftp.mozilla.org'.DIRECTORY_SEPARATOR.'README', - 'ftp://ftp.mozilla.org'.DIRECTORY_SEPARATOR.'pub', + 'ftp://speedtest.tele2.net'.DIRECTORY_SEPARATOR.'1000GB.zip', + 'ftp://speedtest.tele2.net'.DIRECTORY_SEPARATOR.'100GB.zip', ); $actual = array();