Use Perl instead of GNU Sed for increased portability in the eps-test driver

v0.27.3
vog 14 years ago
parent 640921e6c0
commit 8d93c76e67

@ -3,7 +3,7 @@
%%LanguageLevel: 2 %%LanguageLevel: 2
%ADO_ContainsXMP: MainFirst %ADO_ContainsXMP: MainFirst
%%Pages: 1 %%Pages: 1
%Exiv2Version: @Exiv2Version@ %Exiv2Version: _Exiv2Version_
%Exiv2Website: http://www.exiv2.org/ %Exiv2Website: http://www.exiv2.org/
%%EndComments %%EndComments
%%Page: 1 1 %%Page: 1 1

@ -3,7 +3,7 @@
%%LanguageLevel: 2 %%LanguageLevel: 2
%ADO_ContainsXMP: MainFirst %ADO_ContainsXMP: MainFirst
%%Pages: 1 %%Pages: 1
%Exiv2Version: @Exiv2Version@ %Exiv2Version: _Exiv2Version_
%Exiv2Website: http://www.exiv2.org/ %Exiv2Website: http://www.exiv2.org/
%%EndComments %%EndComments
%%Page: 1 1 %%Page: 1 1

@ -3,7 +3,7 @@
%%LanguageLevel: 2 %%LanguageLevel: 2
%ADO_ContainsXMP: MainFirst %ADO_ContainsXMP: MainFirst
%%Pages: 1 %%Pages: 1
%Exiv2Version: @Exiv2Version@ %Exiv2Version: _Exiv2Version_
%Exiv2Website: http://www.exiv2.org/ %Exiv2Website: http://www.exiv2.org/
%%EndComments %%EndComments
%%Page: 1 1 %%Page: 1 1

@ -3,7 +3,7 @@
%%LanguageLevel: 2 %%LanguageLevel: 2
%ADO_ContainsXMP: MainFirst %ADO_ContainsXMP: MainFirst
%%Pages: 1 %%Pages: 1
%Exiv2Version: @Exiv2Version@ %Exiv2Version: _Exiv2Version_
%Exiv2Website: http://www.exiv2.org/ %Exiv2Website: http://www.exiv2.org/
%%EndComments %%EndComments
%%Page: 1 1 %%Page: 1 1

@ -3,7 +3,7 @@
%%LanguageLevel: 2 %%LanguageLevel: 2
%ADO_ContainsXMP: MainFirst %ADO_ContainsXMP: MainFirst
%%Pages: 1 %%Pages: 1
%Exiv2Version: @Exiv2Version@ %Exiv2Version: _Exiv2Version_
%Exiv2Website: http://www.exiv2.org/ %Exiv2Website: http://www.exiv2.org/
%%EndComments %%EndComments
%%Page: 1 1 %%Page: 1 1

@ -6,7 +6,7 @@
%%HiResBoundingBox: 0 0 100 100 %%HiResBoundingBox: 0 0 100 100
%%LanguageLevel: 2 %%LanguageLevel: 2
%ADO_ContainsXMP: MainFirst %ADO_ContainsXMP: MainFirst
%Exiv2Version: @Exiv2Version@ %Exiv2Version: _Exiv2Version_
%Exiv2Website: http://www.exiv2.org/ %Exiv2Website: http://www.exiv2.org/
%%EndComments %%EndComments
%%Page: 1 1 %%Page: 1 1

@ -3,7 +3,7 @@
%%LanguageLevel: 2 %%LanguageLevel: 2
%ADO_ContainsXMP: MainFirst %ADO_ContainsXMP: MainFirst
%%Pages: 1 %%Pages: 1
%Exiv2Version: @Exiv2Version@ %Exiv2Version: _Exiv2Version_
%Exiv2Website: http://www.exiv2.org/ %Exiv2Website: http://www.exiv2.org/
%%EndComments %%EndComments
%%Page: 1 1 %%Page: 1 1

@ -3,7 +3,7 @@
%%LanguageLevel: 2 %%LanguageLevel: 2
%ADO_ContainsXMP: MainFirst %ADO_ContainsXMP: MainFirst
%%Pages: 1 %%Pages: 1
%Exiv2Version: @Exiv2Version@ %Exiv2Version: _Exiv2Version_
%Exiv2Website: http://www.exiv2.org/ %Exiv2Website: http://www.exiv2.org/
%%EndComments %%EndComments
%%Page: 1 1 %%Page: 1 1

@ -3,7 +3,7 @@
%%LanguageLevel: 2 %%LanguageLevel: 2
%ADO_ContainsXMP: MainFirst %ADO_ContainsXMP: MainFirst
%%Pages: 1 %%Pages: 1
%Exiv2Version: @Exiv2Version@ %Exiv2Version: _Exiv2Version_
%Exiv2Website: http://www.exiv2.org/ %Exiv2Website: http://www.exiv2.org/
%%EndComments %%EndComments
%%Page: 1 1 %%Page: 1 1

@ -3,7 +3,7 @@
%ADO_ContainsXMP: MainFirst %ADO_ContainsXMP: MainFirst
%%LanguageLevel: 2 %%LanguageLevel: 2
%%Pages: 1 %%Pages: 1
%Exiv2Version: @Exiv2Version@ %Exiv2Version: _Exiv2Version_
%Exiv2Website: http://www.exiv2.org/ %Exiv2Website: http://www.exiv2.org/
%%EndComments %%EndComments
%%Page: 1 1 %%Page: 1 1

@ -3,7 +3,7 @@
%%LanguageLevel: 2 %%LanguageLevel: 2
%ADO_ContainsXMP: MainFirst %ADO_ContainsXMP: MainFirst
%%Pages: 1 %%Pages: 1
%Exiv2Version: @Exiv2Version@ %Exiv2Version: _Exiv2Version_
%Exiv2Website: http://www.exiv2.org/ %Exiv2Website: http://www.exiv2.org/
%%EndComments %%EndComments
%%Page: 1 1 %%Page: 1 1

@ -3,7 +3,7 @@
%%LanguageLevel: 2 %%LanguageLevel: 2
%ADO_ContainsXMP: MainFirst %ADO_ContainsXMP: MainFirst
%%Pages: 1 %%Pages: 1
%Exiv2Version: @Exiv2Version@ %Exiv2Version: _Exiv2Version_
%Exiv2Website: http://www.exiv2.org/ %Exiv2Website: http://www.exiv2.org/
%%EndComments %%EndComments
%%Page: 1 1 %%Page: 1 1

@ -3,7 +3,7 @@
%%LanguageLevel: 2 %%LanguageLevel: 2
%ADO_ContainsXMP: MainFirst %ADO_ContainsXMP: MainFirst
%%Pages: 1 %%Pages: 1
%Exiv2Version: @Exiv2Version@ %Exiv2Version: _Exiv2Version_
%Exiv2Website: http://www.exiv2.org/ %Exiv2Website: http://www.exiv2.org/
%%EndComments %%EndComments
%%Page: 1 1 %%Page: 1 1

@ -3,7 +3,7 @@
%%LanguageLevel: 2 %%LanguageLevel: 2
%ADO_ContainsXMP: MainFirst %ADO_ContainsXMP: MainFirst
%%Pages: 1 %%Pages: 1
%Exiv2Version: @Exiv2Version@ %Exiv2Version: _Exiv2Version_
%Exiv2Website: http://www.exiv2.org/ %Exiv2Website: http://www.exiv2.org/
%%EndComments %%EndComments
%%Page: 1 1 %%Page: 1 1

@ -6,7 +6,7 @@
%%CreationDate: none %%CreationDate: none
%%LanguageLevel: 2 %%LanguageLevel: 2
%ADO_ContainsXMP: MainFirst %ADO_ContainsXMP: MainFirst
%Exiv2Version: @Exiv2Version@ %Exiv2Version: _Exiv2Version_
%Exiv2Website: http://www.exiv2.org/ %Exiv2Website: http://www.exiv2.org/
%%EndComments %%EndComments
%%BeginProlog %%BeginProlog

@ -6,7 +6,7 @@
%%CreationDate: none %%CreationDate: none
%%LanguageLevel: 2 %%LanguageLevel: 2
%ADO_ContainsXMP: MainFirst %ADO_ContainsXMP: MainFirst
%Exiv2Version: @Exiv2Version@ %Exiv2Version: _Exiv2Version_
%Exiv2Website: http://www.exiv2.org/ %Exiv2Website: http://www.exiv2.org/
%%EndComments %%EndComments
%%BeginProlog %%BeginProlog

@ -8,7 +8,7 @@
%%LanguageLevel: 2 %%LanguageLevel: 2
%ADO_ContainsXMP: MainFirst %ADO_ContainsXMP: MainFirst
%%Pages: 1 %%Pages: 1
%Exiv2Version: @Exiv2Version@ %Exiv2Version: _Exiv2Version_
%Exiv2Website: http://www.exiv2.org/ %Exiv2Website: http://www.exiv2.org/
%%EndComments %%EndComments
%%BeginProlog %%BeginProlog

@ -28,7 +28,7 @@
%%DocumentCustomColors: %%DocumentCustomColors:
%%CMYKCustomColor: %%CMYKCustomColor:
%%RGBCustomColor: %%RGBCustomColor:
%Exiv2Version: @Exiv2Version@ %Exiv2Version: _Exiv2Version_
%Exiv2Website: http://www.exiv2.org/ %Exiv2Website: http://www.exiv2.org/
%%EndComments %%EndComments

@ -1,4 +1,4 @@
%!PS-Adobe-3.0 EPSF-3.0 %%Creator: Adobe Illustrator(TM) 3.2 %%AI8_CreatorVersion: 15.0.0 %%For: (Michael Ulbrich) () %%Title: (zs_oodraw_ai-3-lev2.eps) %%CreationDate: 3/25/11 4:13 PM %%Canvassize: 16383 %%BoundingBox: 199 311 412 481 %%DocumentProcessColors: Black %%DocumentSuppliedResources: procset Adobe_packedarray 2.0 0 %%+ procset Adobe_cshow 1.1 0 %%+ procset Adobe_customcolor 1.0 0 %%+ procset Adobe_IllustratorA_AI3 1.0 1 %AI3_ColorUsage: Color %AI3_IncludePlacedImages %AI3_TemplateBox: 306 396 306 396 %AI3_TileBox: 26.5 16 585.5 799 %AI3_DocumentPreview: Header %%PageOrigin:0 0 %AI7_GridSettings: 72 8 72 8 1 0 0.8 0.8 0.8 0.9 0.9 0.9 %AI9_Flatten: 1 %AI12_CMSettings: 00.MS %%LanguageLevel: 2 %ADO_ContainsXMP: MainFirst %%Pages: 1 %Exiv2Version: @Exiv2Version@ %Exiv2Website: http://www.exiv2.org/ %%EndComments %%BeginProlog %%BeginResource: procset Adobe_packedarray 2.0 0 %!PS-Adobe-3.0 EPSF-3.0 %%Creator: Adobe Illustrator(TM) 3.2 %%AI8_CreatorVersion: 15.0.0 %%For: (Michael Ulbrich) () %%Title: (zs_oodraw_ai-3-lev2.eps) %%CreationDate: 3/25/11 4:13 PM %%Canvassize: 16383 %%BoundingBox: 199 311 412 481 %%DocumentProcessColors: Black %%DocumentSuppliedResources: procset Adobe_packedarray 2.0 0 %%+ procset Adobe_cshow 1.1 0 %%+ procset Adobe_customcolor 1.0 0 %%+ procset Adobe_IllustratorA_AI3 1.0 1 %AI3_ColorUsage: Color %AI3_IncludePlacedImages %AI3_TemplateBox: 306 396 306 396 %AI3_TileBox: 26.5 16 585.5 799 %AI3_DocumentPreview: Header %%PageOrigin:0 0 %AI7_GridSettings: 72 8 72 8 1 0 0.8 0.8 0.8 0.9 0.9 0.9 %AI9_Flatten: 1 %AI12_CMSettings: 00.MS %%LanguageLevel: 2 %ADO_ContainsXMP: MainFirst %%Pages: 1 %Exiv2Version: _Exiv2Version_ %Exiv2Website: http://www.exiv2.org/ %%EndComments %%BeginProlog %%BeginResource: procset Adobe_packedarray 2.0 0
%%Title: (Packed Array Operators) %%Title: (Packed Array Operators)
%%Version: 2.0 0 %%Version: 2.0 0
%%CreationDate: (8/2/90) () %%CreationDate: (8/2/90) ()

@ -1,4 +1,4 @@
%!PS-Adobe-3.0 EPSF-3.0 %%Creator: Adobe Illustrator(TM) 3.2 %%AI8_CreatorVersion: 15.0.0 %%For: (Michael Ulbrich) () %%Title: (zs_oodraw_ai-3-lev3.eps) %%CreationDate: 3/25/11 4:13 PM %%Canvassize: 16383 %%BoundingBox: 199 311 412 481 %%DocumentProcessColors: Black %%DocumentSuppliedResources: procset Adobe_packedarray 2.0 0 %%+ procset Adobe_cshow 1.1 0 %%+ procset Adobe_customcolor 1.0 0 %%+ procset Adobe_IllustratorA_AI3 1.0 1 %AI3_ColorUsage: Color %AI3_IncludePlacedImages %AI3_TemplateBox: 306 396 306 396 %AI3_TileBox: 26.5 16 585.5 799 %AI3_DocumentPreview: Header %%PageOrigin:0 0 %AI7_GridSettings: 72 8 72 8 1 0 0.8 0.8 0.8 0.9 0.9 0.9 %AI9_Flatten: 1 %AI12_CMSettings: 00.MS %%LanguageLevel: 2 %ADO_ContainsXMP: MainFirst %%Pages: 1 %Exiv2Version: @Exiv2Version@ %Exiv2Website: http://www.exiv2.org/ %%EndComments %%BeginProlog %%BeginResource: procset Adobe_packedarray 2.0 0 %!PS-Adobe-3.0 EPSF-3.0 %%Creator: Adobe Illustrator(TM) 3.2 %%AI8_CreatorVersion: 15.0.0 %%For: (Michael Ulbrich) () %%Title: (zs_oodraw_ai-3-lev3.eps) %%CreationDate: 3/25/11 4:13 PM %%Canvassize: 16383 %%BoundingBox: 199 311 412 481 %%DocumentProcessColors: Black %%DocumentSuppliedResources: procset Adobe_packedarray 2.0 0 %%+ procset Adobe_cshow 1.1 0 %%+ procset Adobe_customcolor 1.0 0 %%+ procset Adobe_IllustratorA_AI3 1.0 1 %AI3_ColorUsage: Color %AI3_IncludePlacedImages %AI3_TemplateBox: 306 396 306 396 %AI3_TileBox: 26.5 16 585.5 799 %AI3_DocumentPreview: Header %%PageOrigin:0 0 %AI7_GridSettings: 72 8 72 8 1 0 0.8 0.8 0.8 0.9 0.9 0.9 %AI9_Flatten: 1 %AI12_CMSettings: 00.MS %%LanguageLevel: 2 %ADO_ContainsXMP: MainFirst %%Pages: 1 %Exiv2Version: _Exiv2Version_ %Exiv2Website: http://www.exiv2.org/ %%EndComments %%BeginProlog %%BeginResource: procset Adobe_packedarray 2.0 0
%%Title: (Packed Array Operators) %%Title: (Packed Array Operators)
%%Version: 2.0 0 %%Version: 2.0 0
%%CreationDate: (8/2/90) () %%CreationDate: (8/2/90) ()

@ -28,7 +28,7 @@
%%DocumentCustomColors: %%DocumentCustomColors:
%%CMYKCustomColor: %%CMYKCustomColor:
%%RGBCustomColor: %%RGBCustomColor:
%Exiv2Version: @Exiv2Version@ %Exiv2Version: _Exiv2Version_
%Exiv2Website: http://www.exiv2.org/ %Exiv2Website: http://www.exiv2.org/
%%EndComments %%EndComments

File diff suppressed because one or more lines are too long

@ -28,7 +28,7 @@
%%DocumentCustomColors: %%DocumentCustomColors:
%%CMYKCustomColor: %%CMYKCustomColor:
%%RGBCustomColor: %%RGBCustomColor:
%Exiv2Version: @Exiv2Version@ %Exiv2Version: _Exiv2Version_
%Exiv2Website: http://www.exiv2.org/ %Exiv2Website: http://www.exiv2.org/
%%EndComments %%EndComments

@ -28,7 +28,7 @@
%%DocumentCustomColors: %%DocumentCustomColors:
%%CMYKCustomColor: %%CMYKCustomColor:
%%RGBCustomColor: %%RGBCustomColor:
%Exiv2Version: @Exiv2Version@ %Exiv2Version: _Exiv2Version_
%Exiv2Website: http://www.exiv2.org/ %Exiv2Website: http://www.exiv2.org/
%%EndComments %%EndComments

@ -28,7 +28,7 @@
%%DocumentCustomColors: %%DocumentCustomColors:
%%CMYKCustomColor: %%CMYKCustomColor:
%%RGBCustomColor: %%RGBCustomColor:
%Exiv2Version: @Exiv2Version@ %Exiv2Version: _Exiv2Version_
%Exiv2Website: http://www.exiv2.org/ %Exiv2Website: http://www.exiv2.org/
%%EndComments %%EndComments

@ -28,7 +28,7 @@
%%DocumentCustomColors: %%DocumentCustomColors:
%%CMYKCustomColor: %%CMYKCustomColor:
%%RGBCustomColor: %%RGBCustomColor:
%Exiv2Version: @Exiv2Version@ %Exiv2Version: _Exiv2Version_
%Exiv2Website: http://www.exiv2.org/ %Exiv2Website: http://www.exiv2.org/
%%EndComments %%EndComments

@ -28,7 +28,7 @@
%%DocumentCustomColors: %%DocumentCustomColors:
%%CMYKCustomColor: %%CMYKCustomColor:
%%RGBCustomColor: %%RGBCustomColor:
%Exiv2Version: @Exiv2Version@ %Exiv2Version: _Exiv2Version_
%Exiv2Website: http://www.exiv2.org/ %Exiv2Website: http://www.exiv2.org/
%%EndComments %%EndComments

@ -28,7 +28,7 @@
%%DocumentCustomColors: %%DocumentCustomColors:
%%CMYKCustomColor: %%CMYKCustomColor:
%%RGBCustomColor: %%RGBCustomColor:
%Exiv2Version: @Exiv2Version@ %Exiv2Version: _Exiv2Version_
%Exiv2Website: http://www.exiv2.org/ %Exiv2Website: http://www.exiv2.org/
%%EndComments %%EndComments

@ -28,7 +28,7 @@
%%DocumentCustomColors: %%DocumentCustomColors:
%%CMYKCustomColor: %%CMYKCustomColor:
%%RGBCustomColor: %%RGBCustomColor:
%Exiv2Version: @Exiv2Version@ %Exiv2Version: _Exiv2Version_
%Exiv2Website: http://www.exiv2.org/ %Exiv2Website: http://www.exiv2.org/
%%EndComments %%EndComments

@ -28,7 +28,7 @@
%%DocumentCustomColors: %%DocumentCustomColors:
%%CMYKCustomColor: %%CMYKCustomColor:
%%RGBCustomColor: %%RGBCustomColor:
%Exiv2Version: @Exiv2Version@ %Exiv2Version: _Exiv2Version_
%Exiv2Website: http://www.exiv2.org/ %Exiv2Website: http://www.exiv2.org/
%%EndComments %%EndComments

@ -28,7 +28,7 @@
%%DocumentCustomColors: %%DocumentCustomColors:
%%CMYKCustomColor: %%CMYKCustomColor:
%%RGBCustomColor: %%RGBCustomColor:
%Exiv2Version: @Exiv2Version@ %Exiv2Version: _Exiv2Version_
%Exiv2Website: http://www.exiv2.org/ %Exiv2Website: http://www.exiv2.org/
%%EndComments %%EndComments

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

@ -7,7 +7,7 @@
%ADO_ContainsXMP: MainFirst %ADO_ContainsXMP: MainFirst
%%LanguageLevel: 2 %%LanguageLevel: 2
%%Pages: 1 %%Pages: 1
%Exiv2Version: @Exiv2Version@ %Exiv2Version: _Exiv2Version_
%Exiv2Website: http://www.exiv2.org/ %Exiv2Website: http://www.exiv2.org/
%%EndComments %%EndComments
%%BeginProlog %%BeginProlog

@ -7,7 +7,7 @@
%ADO_ContainsXMP: MainFirst %ADO_ContainsXMP: MainFirst
%%LanguageLevel: 2 %%LanguageLevel: 2
%%Pages: 1 %%Pages: 1
%Exiv2Version: @Exiv2Version@ %Exiv2Version: _Exiv2Version_
%Exiv2Website: http://www.exiv2.org/ %Exiv2Website: http://www.exiv2.org/
%%EndComments %%EndComments
%%BeginProlog %%BeginProlog

@ -12,7 +12,6 @@ else
bin="$VALGRIND $EXIV2_BINDIR" bin="$VALGRIND $EXIV2_BINDIR"
samples="$VALGRIND $EXIV2_BINDIR" samples="$VALGRIND $EXIV2_BINDIR"
fi fi
gsed=`gsed --help >/dev/null 2>&1 && echo g`sed
exiv2version="`$bin/exiv2 -V | sed -n '1 s,^exiv2 \([^ ]*\).*,\1,p'`" exiv2version="`$bin/exiv2 -V | sed -n '1 s,^exiv2 \([^ ]*\).*,\1,p'`"
if [ -z "$exiv2version" ]; then if [ -z "$exiv2version" ]; then
echo "Error: Unable to determine Exiv2 version" echo "Error: Unable to determine Exiv2 version"
@ -23,7 +22,7 @@ if ! diff -q $diffargs /dev/null /dev/null 2>/dev/null ; then
diffargs="" diffargs=""
fi fi
for file in ../data/eps/eps-*.eps.newxmp; do for file in ../data/eps/eps-*.eps.newxmp; do
if ! grep "@Exiv2Version@" "$file" >/dev/null ; then if ! grep "_Exiv2Version_" "$file" >/dev/null ; then
echo "Error: data/eps/$file contains hard-coded Exiv2 version" echo "Error: data/eps/$file contains hard-coded Exiv2 version"
exit 1 exit 1
fi fi
@ -74,7 +73,8 @@ done
continue continue
fi fi
$gsed "s,@Exiv2Version@,$exiv2version," < "../data/eps/$image.eps.newxmp" > "$image.eps.newxmp" # using perl instead of sed, because on some systems sed adds a line ending at EOF
perl -pe "s,_Exiv2Version_,$exiv2version," < "../data/eps/$image.eps.newxmp" > "$image.eps.newxmp"
if ! diff -q "$image.eps.newxmp" "$image.eps" ; then if ! diff -q "$image.eps.newxmp" "$image.eps" ; then
continue continue

Loading…
Cancel
Save