diff options
Diffstat (limited to 'tests/PHPUnit/Framework/Fixture.php')
-rw-r--r-- | tests/PHPUnit/Framework/Fixture.php | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/tests/PHPUnit/Framework/Fixture.php b/tests/PHPUnit/Framework/Fixture.php index 693b76e280..a2d6a6327a 100644 --- a/tests/PHPUnit/Framework/Fixture.php +++ b/tests/PHPUnit/Framework/Fixture.php @@ -758,12 +758,18 @@ class Fixture extends \PHPUnit_Framework_Assert . '--url="' . self::getRootUrl() . 'tests/PHPUnit/proxy/" ' # proxy so that piwik uses test config files ; - foreach ($options as $name => $value) { - $cmd .= $name; - if ($value !== false) { - $cmd .= '="' . $value . '"'; + foreach ($options as $name => $values) { + if (!is_array($values)) { + $values = array($values); + } + + foreach ($values as $value) { + $cmd .= $name; + if ($value !== false) { + $cmd .= '="' . $value . '"'; + } + $cmd .= ' '; } - $cmd .= ' '; } $cmd .= '"' . $logFile . '" 2>&1'; |