Windows compat for a couple of tests :(

diff --git a/tests/phpunit/includes/media/GIFMetadataExtractorTest.php b/tests/phpunit/includes/media/GIFMetadataExtractorTest.php
index 59b3044..47fc368 100644 (file)
--- a/tests/phpunit/includes/media/GIFMetadataExtractorTest.php
+++ b/tests/phpunit/includes/media/GIFMetadataExtractorTest.php
@@ -63,6 +63,7 @@ class GIFMetadataExtractorTest extends MediaWikiTestCase {
                                                                                                     
 <?xpacket end='w'?>
 EOF;
+               $xmpNugget = str_replace( "\r", '', $xmpNugget ); // Windows compat
 
                return array(
                        array( 'nonanimated.gif', array(

diff --git a/tests/phpunit/includes/media/SVGMetadataExtractorTest.php b/tests/phpunit/includes/media/SVGMetadataExtractorTest.php
index c2c81b9..d07ba40 100644 (file)
--- a/tests/phpunit/includes/media/SVGMetadataExtractorTest.php
+++ b/tests/phpunit/includes/media/SVGMetadataExtractorTest.php
@@ -67,18 +67,20 @@ class SVGMetadataExtractorTest extends MediaWikiTestCase {
 
        function providerSvgFilesWithXMLMetadata() {
                $base = dirname( __FILE__ ) . '/../../data/media';
-               return array(
-                       array(
-                               "$base/US_states_by_total_state_tax_revenue.svg",
-                               array(
-                                       'height' => 593,
-                                       'metadata' =>
+               $metadata = 
     '<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
       <ns4:Work xmlns:ns4="http://creativecommons.org/ns#" rdf:about="">
         <ns5:format xmlns:ns5="http://purl.org/dc/elements/1.1/">image/svg+xml</ns5:format>
         <ns5:type xmlns:ns5="http://purl.org/dc/elements/1.1/" rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
       </ns4:Work>
-    </rdf:RDF>',
+    </rdf:RDF>';
+               $metadata = str_replace( "\r", '', $metadata ); // Windows compat
+               return array(
+                       array(
+                               "$base/US_states_by_total_state_tax_revenue.svg",
+                               array(
+                                       'height' => 593,
+                                       'metadata' => $metadata,
                                        'width' => 959
                                )
                        ),