[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=5c39739

The following commit has been merged in the master branch:
commit 5c3973991e817528ac81b1ba8cd9e6a69e622201
Author: Robin Mills <robin at clanmills.com>
Date:   Thu Sep 29 13:05:39 2016 +0000

    #1023 HTTP and HTTPS test support.
---
 Makefile                |  2 +-
 config/Makefile.in      |  2 +-
 test/data/http-test.out | 14 ++++++++++++++
 test/http-test.sh       | 32 ++++++++++++++++++++++++++++++++
 4 files changed, 48 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index ea69c41..1adc53e 100644
--- a/Makefile
+++ b/Makefile
@@ -97,7 +97,7 @@ video-test.sh      write-test.sh   write-video-test.sh write2-test.sh         xm
 bugtest bugstest testbugs bugfixes:
 	cd test && ./bugfixes-test.sh
 
-bugfixes-test icc-test preview-test webp-test stdin-test geotag-test:
+bugfixes-test icc-test preview-test webp-test stdin-test geotag-test http-test:
 	cd test && ./$@.sh
 
 # convenience target for building individual sample programs
diff --git a/config/Makefile.in b/config/Makefile.in
index ea69c41..1adc53e 100644
--- a/config/Makefile.in
+++ b/config/Makefile.in
@@ -97,7 +97,7 @@ video-test.sh      write-test.sh   write-video-test.sh write2-test.sh         xm
 bugtest bugstest testbugs bugfixes:
 	cd test && ./bugfixes-test.sh
 
-bugfixes-test icc-test preview-test webp-test stdin-test geotag-test:
+bugfixes-test icc-test preview-test webp-test stdin-test geotag-test http-test:
 	cd test && ./$@.sh
 
 # convenience target for building individual sample programs
diff --git a/test/data/http-test.out b/test/data/http-test.out
new file mode 100644
index 0000000..064489e
--- /dev/null
+++ b/test/data/http-test.out
@@ -0,0 +1,14 @@
+http://exiv2.dyndns.org:8080/userContent/testfiles/webready//Reagan.jpg
+Exif.Image.Software                          Ascii      40  Adobe Photoshop Elements 12.0 Macintosh
+http://exiv2.dyndns.org:8080/userContent/testfiles/webready//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
+Exif.Image.Software                          Ascii      12  GIMP 2.8.18
diff --git a/test/http-test.sh b/test/http-test.sh
new file mode 100755
index 0000000..7742bc5
--- /dev/null
+++ b/test/http-test.sh
@@ -0,0 +1,32 @@
+#!/bin/bash
+# Test driver for http
+
+source ./functions.source
+
+
+(   cd "$testdir"
+
+    host=http://exiv2.dyndns.org:8080/
+    dir=userContent/testfiles/webready/
+    for host in http://exiv2.dyndns.org:8080 https://exiv2.dyndns.org: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 > $results 2>&1
+
+printf "
"
+
+# ----------------------------------------------------------------------
+# Evaluate results
+cat $results | tr -d $'
' > $results-stripped
+mv                           $results-stripped $results
+reportTest                                     $results $good
+
+# That's all Folks!
+##

-- 
exiv2 packaging