third_party/exiv2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

#1023 Fix http-test.sh to detect support for https. This isn't working very well. I think the jenkins/https support is suspect.

Browse Source
This commit is contained in:
Robin Mills 2016-09-29 19:38:12 +00:00
parent 1b536bd0ed
commit dbd7e7de10
2 changed files with 27 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
test/data/http-test.out
View File

@ -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

42
test/http-test.sh
View File

@ -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!
##