Skip to content

Commit eca98fe

Browse files
committed
FIXUP testwarn
1 parent d48d53a commit eca98fe

File tree

2 files changed

+1
-7
lines changed

2 files changed

+1
-7
lines changed

tests/data/test196.param

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,3 @@ PRECOMMAND='cat "$STAGINGDIR/point1-1.jpg" >"$LOGDIR/test.jpg"'
33
COMMAND='$PROGRAM --no-interpolation --photooffset 10 -z 0 -g "$STAGINGDIR/timeback.gpx" "$LOGDIR/test.jpg" > "$OUTFILE" 2>&1 && exiv2 -pv pr "$LOGDIR/test.jpg" >> "$OUTFILE" 2>&1'
44
POSTCOMMAND='rm -f "$LOGDIR/test.jpg"'
55
RESULTCODE=0
6-
# Move the Warning: line(s) to the end of the file so they are in a known
7-
# location (carefully, especially with edge cases like the line already
8-
# appearing at the end of the file), since the blending of stdout/stderr is
9-
# done differently on different platforms. Unfortunately, BSD sed doesn't
10-
# support grouping commands with {}.
11-
SEDCOMMAND='$G;s/\n//;$q;/Warning:/H;/Warning:/d'

tests/data/test196.result

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
Reading GPS Data...Warning: track points are not ordered by time (first bad point at 2012-11-22T12:35:01Z).
12

23
Legend: . = Ok, / = Interpolated, < = Rounded, - = No match, ^ = Too far
34
w = Write Fail, ? = No EXIF date, ! = GPS already present
@@ -33,4 +34,3 @@ Failed: 0 (0 Not matched, 0 Write failure, 0 Too Far,
3334
0x0007 GPSInfo GPSTimeStamp Rational 3 12/1 35/1 6/1
3435
0x0012 GPSInfo GPSMapDatum Ascii 7 WGS-84
3536
0x001d GPSInfo GPSDateStamp Ascii 11 2012:11:22
36-
Reading GPS Data...Warning: track points are not ordered by time (first bad point at 2012-11-22T12:35:01Z).

0 commit comments

Comments
 (0)