From dbd7e7de1091c9ba8b99a054ae8d5e1ab168e934 Mon Sep 17 00:00:00 2001
From: Robin Mills <robin@clanmills.com>
Date: Thu, 29 Sep 2016 19:38:12 +0000
Subject: [PATCH] #1023  Fix http-test.sh to detect support for https.  This
 isn't working very well.  I think the jenkins/https support is suspect.

---
 test/data/http-test.out | 15 ++++-----------
 test/http-test.sh       | 42 ++++++++++++++++++++++-------------------
 2 files changed, 27 insertions(+), 30 deletions(-)

diff --git a/test/data/http-test.out b/test/data/http-test.out
index c9159948..cc2d528a 100644
--- a/test/data/http-test.out
+++ b/test/data/http-test.out
@@ -1,14 +1,7 @@
-http://exiv2.dyndns.org:8080/userContent/testfiles/webready/Reagan.jpg
+Reagan.jpg
 Exif.Image.Software                          Ascii      40  Adobe Photoshop Elements 12.0 Macintosh
-http://exiv2.dyndns.org:8080/userContent/testfiles/webready/ReaganLargePng.png
+ReaganLargePng.png
 Exif.Image.Software                          Ascii      11  GIMP 2.9.5
-http://exiv2.dyndns.org:8080/userContent/testfiles/webready/ReaganLargeTiff.tiff
-http://exiv2.dyndns.org:8080/userContent/testfiles/webready/ReaganLargeJpg.jpg
-Exif.Image.Software                          Ascii      12  GIMP 2.8.18
-https://exiv2.dyndns.org:8443/userContent/testfiles/webready/Reagan.jpg
-Exif.Image.Software                          Ascii      40  Adobe Photoshop Elements 12.0 Macintosh
-https://exiv2.dyndns.org:8443/userContent/testfiles/webready/ReaganLargePng.png
-Exif.Image.Software                          Ascii      11  GIMP 2.9.5
-https://exiv2.dyndns.org:8443/userContent/testfiles/webready/ReaganLargeTiff.tiff
-https://exiv2.dyndns.org:8443/userContent/testfiles/webready/ReaganLargeJpg.jpg
+ReaganLargeTiff.tiff
+ReaganLargeJpg.jpg
 Exif.Image.Software                          Ascii      12  GIMP 2.8.18
diff --git a/test/http-test.sh b/test/http-test.sh
index 4de842b3..5b09fdf5 100755
--- a/test/http-test.sh
+++ b/test/http-test.sh
@@ -2,31 +2,35 @@
 # Test driver for http
 
 source ./functions.source
+cd "$testdir"
 
+server=exiv2.dyndns.org
+dir=userContent/testfiles/webready
+hosts="http://$server:8080"
 
-(   cd "$testdir"
+if [ $(runTest exiv2 -vVg curlproto | grep -q https ; echo $?) == "0" ]; then
+    hosts="https://$server:8443"
+else
+    echo "https is not a supported protocol"
+fi
 
-    server=exiv2.dyndns.org
-    dir=userContent/testfiles/webready
-    for host in http://$server:8080 https://$server:8443
-    do
-    	printf "$host " >&3
-		for filename in Reagan.jpg ReaganLargePng.png ReaganLargeTiff.tiff ReaganLargeJpg.jpg
-		do
-			echo $host/$dir/$filename
-			runTest exiv2 -pa --grep Software $host/$dir/$filename
-		done
-	done
-
-) 3>&1 2>&1 > $results
+(   (   for host in $hosts ; do
+            printf "$host " >&3
+            for filename in Reagan.jpg ReaganLargePng.png ReaganLargeTiff.tiff ReaganLargeJpg.jpg; do
+                echo $filename
+                runTest exiv2 -pa --grep Software $host/$dir/$filename
+            done
+        done
+    ) 2>&1 > $results
 
+    # ----------------------------------------------------------------------
+    # Evaluate results
+    cat $results | tr -d $'\r' > $results-stripped
+    mv                           $results-stripped $results
+    reportTest                                     $results $good
+) 3>&1
 printf "\n"
 
-# ----------------------------------------------------------------------
-# Evaluate results
-cat $results | tr -d $'\r' > $results-stripped
-mv                           $results-stripped $results
-reportTest                                     $results $good
 
 # That's all Folks!
 ##