Fix the huge hack to start tests on Windows 8.

This commit is contained in:
Sébastien Lucas 2014-12-29 06:20:01 +01:00
parent d5a75e1beb
commit 49fed9ef11

View file

@ -30,7 +30,7 @@ class OpdsTest extends PHPUnit_Framework_TestCase
$path = ""; $path = "";
if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') { if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
// huge hack, not proud about it // huge hack, not proud about it
$path = "c:\\Progra~1\\Java\\jre7\\bin\\"; $path = "c:\\Progra~1\\Java\\jre1.8.0_25\\bin\\";
} }
$res = system($path . 'java -jar ' . JING_JAR . ' ' . $relax . ' ' . $feed); $res = system($path . 'java -jar ' . JING_JAR . ' ' . $relax . ' ' . $feed);
if ($res != '') { if ($res != '') {
@ -46,7 +46,7 @@ class OpdsTest extends PHPUnit_Framework_TestCase
$path = ""; $path = "";
if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') { if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
// huge hack, not proud about it // huge hack, not proud about it
$path = "c:\\Progra~1\\Java\\jre7\\bin\\"; $path = "c:\\Progra~1\\Java\\jre1.8.0_25\\bin\\";
} }
$res = system($path . 'java -jar ' . OPDSVALIDATOR_JAR . ' ' . $feed); $res = system($path . 'java -jar ' . OPDSVALIDATOR_JAR . ' ' . $feed);
chdir($oldcwd); chdir($oldcwd);