From: tsteven4 <tsteven4@gmail.com>
Date: Fri, 20 Jul 2018 01:51:51 +0000 (-0600)
Subject: fix exif test to run in any time zone.
X-Git-Tag: archive/raspbian/1.10.0+ds-2+rpi1~1^2~12^2~8^2~92^2~11
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=0fdc19dddebaf3950a48a12214223b1e2d226fd4;p=gpsbabel.git

fix exif test to run in any time zone.
---

diff --git a/reference/20180717_080125.csv b/reference/20180717_080125.csv
index 8135d6a0a..1a2cdaba2 100644
--- a/reference/20180717_080125.csv
+++ b/reference/20180717_080125.csv
@@ -1,2 +1,2 @@
-No,Latitude,Longitude,Name,Date,Time
-1,40.000278,-105.311667,"20180717_080125",2018/07/17,08:01:25
+No,Latitude,Longitude,Name,utc_d,utc_t
+1,40.000278,-105.311667,"20180717_080125",2018/07/17,14:01:25
diff --git a/reference/IMG_2065_retag.csv b/reference/IMG_2065_retag.csv
index 077b1dfc1..0617227cd 100644
--- a/reference/IMG_2065_retag.csv
+++ b/reference/IMG_2065_retag.csv
@@ -1,2 +1,2 @@
-No,Latitude,Longitude,Name,Speed,Date,Time
-1,44.315150,15.265690,"IMG_2065",0.00,2006/05/21,14:46:58
+No,Latitude,Longitude,Name,Speed,utc_d,utc_t
+1,44.315150,15.265690,"IMG_2065",0.00,2006/05/21,20:46:58
diff --git a/testo.d/exif.test b/testo.d/exif.test
index 2daf554dd..ff153c4e5 100644
--- a/testo.d/exif.test
+++ b/testo.d/exif.test
@@ -4,7 +4,7 @@ compare ${REFERENCE}/exif-dat.csv ${TMPDIR}/exif-dat.csv
 
 # write test
 cp ${REFERENCE}/20180717_080125.jpg ${TMPDIR}/20180717_080125.jpg
-gpsbabel -i unicsv -f ${REFERENCE}/20180717_080125.csv -o exif -F ${TMPDIR}/20180717_080125.jpg
+gpsbabel -i unicsv -f ${REFERENCE}/20180717_080125.csv -o exif,name=20180717_080125 -F ${TMPDIR}/20180717_080125.jpg
 bincompare ${REFERENCE}/20180717_080125.jpg.jpg ${TMPDIR}/20180717_080125.jpg.jpg
 
 # write test with IFD0 and IFD1 present, which triggers some "next" code.