Skip to content

Commit

Permalink
Merge pull request #208 from michaelbutler/michaelbutler/case_sensiti…
Browse files Browse the repository at this point in the history
…ve_fix

Fix failed build (Mb/MB check and require php-code-coverage 3.X)
  • Loading branch information
julianseeger committed Jun 9, 2016
2 parents cd5206f + 5ba6c3c commit c74e4a8
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
3 changes: 2 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
"ext-reflection": "*",
"ext-simplexml": "*",
"ext-pcre": "*",
"composer/semver": "~1.2"
"composer/semver": "~1.2",
"phpunit/php-code-coverage": "<=3.3.9"
},
"type": "library",
"description": "Parallel testing for PHP",
Expand Down
2 changes: 1 addition & 1 deletion test/unit/ParaTest/Runners/PHPUnit/ResultPrinterTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ public function testGetHeader()
$this->assertRegExp(
"/\n\nTime: [0-9]+([.][0-9]{1,2})? " .
"(minute|minutes|second|seconds|ms)?," .
" Memory:[\s][0-9]+([.][0-9]{1,2})?Mb\n\n/",
" Memory:[\s][0-9]+([.][0-9]{1,2})?M[Bb]\n\n/",
$header
);
}
Expand Down

0 comments on commit c74e4a8

Please # to comment.