From e57a9e103bb95666f4588904aecf3005c9955ec5 Mon Sep 17 00:00:00 2001
From: Robin Mills <robin@clanmills.com>
Date: Tue, 27 Sep 2016 17:31:01 +0000
Subject: [PATCH] #1233 Fixes for the test suite on msvc.

---
 test/geotag-test.sh | 4 ++--
 test/testMSVC.sh    | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/test/geotag-test.sh b/test/geotag-test.sh
index 0bd38e4f..d08a14c3 100755
--- a/test/geotag-test.sh
+++ b/test/geotag-test.sh
@@ -13,12 +13,12 @@ source ./functions.source
 
     echo --- show GPSInfo tags ---
     runTest                      exiv2 -pa --grep GPSInfo $jpg
-    tags=$(runTest               exiv2 -Pk --grep GPSInfo $jpg)
+    tags=$(runTest               exiv2 -Pk --grep GPSInfo $jpg  | tr -d '\r') # MSVC puts out cr-lf lines
     echo --- deleting the GPSInfo tags
     for tag in $tags; do runTest exiv2 -M"del $tag" $jpg; done
     runTest                      exiv2 -pa --grep GPS     $jpg
     echo --- run geotag ---
-    runTest                      geotag -ascii -tz -8:00 $jpg $gpx | cut -d' ' -f 2- | sed -E -e 's/\xb0/___/g'
+    runTest                      geotag -ascii -tz -8:00 $jpg $gpx | cut -d' ' -f 2-
     echo --- show GPSInfo tags ---
     runTest                      exiv2 -pa --grep GPSInfo $jpg
 
diff --git a/test/testMSVC.sh b/test/testMSVC.sh
index 738276a7..dd4312b6 100755
--- a/test/testMSVC.sh
+++ b/test/testMSVC.sh
@@ -4,7 +4,7 @@ msvc=$1
 test=$2
 home=$(dirname $(readlink -f $0))
 
-if [ -z $msvc ]; then
+if [ -z "$msvc" ]; then
     echo usage: $0 \<path-to-msvc-bin\> [test]
     exit
 fi
@@ -33,7 +33,9 @@ for d in $(find "$msvc" -name exiv2.exe -exec dirname {} ";"); do
     (
       cd "$home/.."
       make $test
-      $d/exiv2.exe -v -V
+      if [ -z "$2" ]; then
+          $d/exiv2.exe -v -V
+      fi
     )
 done