[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 13 17:39:01 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=6a8ca60
The following commit has been merged in the master branch:
commit 6a8ca6051db78177e6e3e2a355a97772c964b540
Author: Andreas Huggel <ahuggel at gmx.net>
Date: Sun Oct 21 08:41:12 2007 +0000
Tweaks.
---
src/Makefile | 2 +-
test/bugfixes-test.sh | 17 +++++------------
test/xmpparser-test.sh | 11 ++---------
3 files changed, 8 insertions(+), 22 deletions(-)
diff --git a/src/Makefile b/src/Makefile
index 07ec234..5b96770 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -95,7 +95,7 @@ CCSRC += pngimage.cpp \
endif
CCSRC += rafimage.cpp \
sigmamn.cpp \
- pentaxmn.cpp \
+ pentaxmn.cpp \
sonymn.cpp \
tags.cpp \
tiffcomposite.cpp \
diff --git a/test/bugfixes-test.sh b/test/bugfixes-test.sh
index faea5fb..de63a62 100755
--- a/test/bugfixes-test.sh
+++ b/test/bugfixes-test.sh
@@ -2,13 +2,6 @@
# Test driver with regression tests for bugfixes
results="./tmp/bugfixes-test.out"
good="./data/bugfixes-test.out"
-diffargs="--strip-trailing-cr"
-tmpfile=tmp/ttt
-touch $tmpfile
-diff -q $diffargs $tmpfile $tmpfile 2>/dev/null
-if [ $? -ne 0 ] ; then
- diffargs=""
-fi
prep_file()
{
@@ -91,13 +84,13 @@ $exiv2 -pi $filename
) > $results 2>&1
-if [ x"`which unix2dos.exe`" != x ]; then
- unix2dos.exe -q $results
-fi
-diff -q $diffargs $results $good
+# ----------------------------------------------------------------------
+# Evaluate results
+cat $results | tr -d '
' > $results-stripped
+diff -q $results-stripped $good
rc=$?
if [ $rc -eq 0 ] ; then
echo "All testcases passed."
else
- diff $diffargs $results $good
+ diff $results-stripped $good
fi
diff --git a/test/xmpparser-test.sh b/test/xmpparser-test.sh
index 9b086c5..8eebe59 100755
--- a/test/xmpparser-test.sh
+++ b/test/xmpparser-test.sh
@@ -12,13 +12,6 @@ fi
# Setup
results="./tmp/xmpparser-test.out"
good="./data/xmpparser-test.out"
-diffargs="--strip-trailing-cr"
-tmpfile=tmp/ttt
-touch $tmpfile
-diff -q $diffargs $tmpfile $tmpfile 2>/dev/null
-if [ $? -ne 0 ] ; then
- diffargs=""
-fi
# ----------------------------------------------------------------------
# Main routine
@@ -66,10 +59,10 @@ $exiv2 -v -px exiv2-empty.jpg
# ----------------------------------------------------------------------
# Evaluate results
cat $results | tr -d '
' > $results-stripped
-diff -q $diffargs $results-stripped $good
+diff -q $results-stripped $good
rc=$?
if [ $rc -eq 0 ] ; then
echo "All testcases passed."
else
- diff $diffargs $results-stripped $good
+ diff $results-stripped $good
fi
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list