Remove the ugly path for java. It's not needed anymore.
This commit is contained in:
		
							parent
							
								
									0a0007a096
								
							
						
					
					
						commit
						188b15b1b8
					
				
					 1 changed files with 0 additions and 8 deletions
				
			
		|  | @ -28,10 +28,6 @@ class OpdsTest extends PHPUnit_Framework_TestCase | ||||||
| 
 | 
 | ||||||
|     function jingValidateSchema($feed, $relax = OPDS_RELAX_NG) { |     function jingValidateSchema($feed, $relax = OPDS_RELAX_NG) { | ||||||
|         $path = ""; |         $path = ""; | ||||||
|         if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') { |  | ||||||
|             // huge hack, not proud about it
 |  | ||||||
|             $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 != '') { | ||||||
|             echo 'RelaxNG validation error: '.$res; |             echo 'RelaxNG validation error: '.$res; | ||||||
|  | @ -44,10 +40,6 @@ class OpdsTest extends PHPUnit_Framework_TestCase | ||||||
|         $oldcwd = getcwd(); // Save the old working directory
 |         $oldcwd = getcwd(); // Save the old working directory
 | ||||||
|         chdir("test"); |         chdir("test"); | ||||||
|         $path = ""; |         $path = ""; | ||||||
|         if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') { |  | ||||||
|             // huge hack, not proud about it
 |  | ||||||
|             $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); | ||||||
|         if ($res != '') { |         if ($res != '') { | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue