From 13a990d3d9cfa51f0d4b17e6e41d107b4bce00d8 Mon Sep 17 00:00:00 2001
From: Robin Mills <robin@clanmills.com>
Date: Thu, 22 Sep 2016 11:20:32 +0000
Subject: [PATCH] #1109 MinGW/32 daily build.  Avoid -svn-0-date builds. 
 Changes to test suite for mingw.

---
 contrib/buildserver/cmake_daily.sh |  7 +++-
 test/data/webp-test.out            | 65 +++++++++++-------------------
 test/webp-test.sh                  |  2 +-
 3 files changed, 29 insertions(+), 45 deletions(-)

diff --git a/contrib/buildserver/cmake_daily.sh b/contrib/buildserver/cmake_daily.sh
index f1996cf7..260012f4 100755
--- a/contrib/buildserver/cmake_daily.sh
+++ b/contrib/buildserver/cmake_daily.sh
@@ -191,10 +191,9 @@ testBuild()
                     export CFLAGS=-m32
                     export CXXFLAGS=-m32
                     export LDFLAGS=-m32
-                    /c/MinGW/msys/1.0/bin/bash.exe -c "export PATH=/c/Qt/Qt5.6.0/5.6/mingw49_32/bin:/c/Qt/Qt5.6.0/Tools/mingw492_32/bin:/c/MinGW/bin:/usr/bin:/usr/local/bin:/c/cygwin64/bin:/c/Users/rmills/com:. ; $0"
+                    /c/MinGW/msys/1.0/bin/bash.exe -c "export PATH=/c/Qt/Qt5.6.0/5.6/mingw49_32/bin:/c/Qt/Qt5.6.0/Tools/mingw492_32/bin:/c/MinGW/bin:/usr/bin:/usr/local/bin:. ; $0"
                     result=$?
                 fi
-                exit 0 ; # stop now. RECURSIVE will do the packaging
             fi
         ;;
 
@@ -218,6 +217,9 @@ testBuild()
     esac
 ) | tee "$build/dist/logs/build.log"
 
+# exit if are in mingw and leave cygwin to package the build
+if [ $(uname -o) == "Msys" ]; then echo "goodbye from mingw" ; exit 0; fi
+
 ##
 # store the build for users to collect
 if [ "$result" == "0" ]; then
@@ -244,6 +246,7 @@ if [ "$result" == "0" ]; then
         if [ "$?" == "0" ]; then
             svn=$(/usr/local/bin/svn info . | grep '^Last Changed Rev' | cut -f 2 -d':' | tr -d ' ')
         fi
+        
         dow=$(date  '+%w') # 0..6   day of the week
         dom=$(date  '+%d') # 1..31  day of the month
         mon=$(date  '+%m') # 1..12  month
diff --git a/test/data/webp-test.out b/test/data/webp-test.out
index e9d13656..28e3f6f5 100644
--- a/test/data/webp-test.out
+++ b/test/data/webp-test.out
@@ -145,48 +145,29 @@ STRUCTURE OF WEBP FILE: exiv2-bug1199.webp
   END MemIo
   XMP  |     2864 |   184662 | <?xpacket begin="..." id="W5M0Mp
 <?xml version="1.0"?>
-<?xpacket
-begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
-<x:xmpmeta
-    xmlns:x="adobe:ns:meta/"
-    x:xmptk="XMP Core 4.4.0-Exiv2"
-  > <rdf:RDF
-      xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-    > <rdf:Description
-        xmlns:dc="http://purl.org/dc/elements/1.1/"
-        xmlns:xmp="http://ns.adobe.com/xap/1.0/"
-        xmlns:photoshop="http://ns.adobe.com/photoshop/1.0/"
-        rdf:about=""
-        dc:Format="image/webp"
-        xmp:ModifyDate="2015-07-16T20:25:28+01:00"
-        xmp:Rating="0"
-        photoshop:AuthorsPosition="Stonehenge"
-      > <dc:description
-        > <rdf:Alt
-          > <rdf:li
-              xml:lang="x-default"
-            >Classic View</rdf:li
-          > </rdf:Alt
-        > </dc:description
-      > <dc:title
-        > <rdf:Alt
-          > <rdf:li
-              xml:lang="x-default"
-            >Stonehenge</rdf:li
-          > </rdf:Alt
-        > </dc:title
-      > <dc:creator
-        > <rdf:Seq
-          > <rdf:li
-            >Robin Mills</rdf:li
-          > </rdf:Seq
-        > </dc:creator
-      > </rdf:Description
-    > </rdf:RDF
-  > </x:xmpmeta
->
-<?xpacket
-end="w"?>
+<?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="XMP Core 4.4.0-Exiv2">
+  <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+    <rdf:Description xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:xmp="http://ns.adobe.com/xap/1.0/" xmlns:photoshop="http://ns.adobe.com/photoshop/1.0/" rdf:about="" dc:Format="image/webp" xmp:ModifyDate="2015-07-16T20:25:28+01:00" xmp:Rating="0" photoshop:AuthorsPosition="Stonehenge">
+      <dc:description>
+        <rdf:Alt>
+          <rdf:li xml:lang="x-default">Classic View</rdf:li>
+        </rdf:Alt>
+      </dc:description>
+      <dc:title>
+        <rdf:Alt>
+          <rdf:li xml:lang="x-default">Stonehenge</rdf:li>
+        </rdf:Alt>
+      </dc:title>
+      <dc:creator>
+        <rdf:Seq>
+          <rdf:li>Robin Mills</rdf:li>
+        </rdf:Seq>
+      </dc:creator>
+    </rdf:Description>
+  </rdf:RDF>
+</x:xmpmeta>
+<?xpacket end="w"?>
 STRUCTURE OF WEBP FILE: exiv2-bug1199.webp
  Chunk |   Length |   Offset | Payload
   RIFF |   187526 |        0 | WEBP
diff --git a/test/webp-test.sh b/test/webp-test.sh
index f654206f..a1ca36ec 100755
--- a/test/webp-test.sh
+++ b/test/webp-test.sh
@@ -15,7 +15,7 @@ source ./functions.source
     copyTestFile                        $filename
     runTest exiv2 -pS                   $filename
     runTest exiv2 -pR                   $filename
-    runTest exiv2 -pX                   $filename | xmllint --pretty 2 -
+    runTest exiv2 -pX                   $filename | xmllint --format -
     printf "delete " >&3
     # test deleting metadata
     for option in -dC -de -dx -dCe -dCx -dCxe; do