CliTester: pass Environment::COVERAGE locally by Runner [Ref #241]

nette · May 19, 2016 · 1b583e9 · 1b583e9
1 parent a1e696b
commit 1b583e9
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/src/Runner/CliTester.php b/src/Runner/CliTester.php
@@ -61,6 +61,9 @@ public function run()
 		$runner = $this->createRunner();
 		$runner->setEnvironmentVariable(Environment::RUNNER, 1);
 		$runner->setEnvironmentVariable(Environment::COLORS, (int) Environment::$useColors);
+		if (isset($coverageFile)) {
+			$runner->setEnvironmentVariable(Environment::COVERAGE, $coverageFile);
+		}
 
 		if ($this->options['-o'] !== NULL) {
 			ob_clean();
@@ -74,7 +77,7 @@ public function run()
 
 		$result = $runner->run();
 
-		if (isset($coverageFile)) {
+		if (isset($coverageFile) && preg_match('#\.(?:html?|xml)\z#', $coverageFile)) {
 			$this->finishCodeCoverage($coverageFile);
 		}
 
@@ -214,11 +217,8 @@ private function prepareCodeCoverage()
 		}
 		file_put_contents($this->options['--coverage'], '');
 		$file = realpath($this->options['--coverage']);
-		putenv(Environment::COVERAGE . '=' . $file);
 		echo "Code coverage: {$file}\n";
-		if (preg_match('#\.(?:html?|xml)\z#', $file)) {
-			return $file;
-		}
+		return $file;
 	}