Replaced the 16-bit msvc\diff.exe with the msys 32-bit version
Added msys support dlls required by diff.exe Use msvc\diff.exe for use in exiv2-test.sh Use dos2unix if available to fix line-endings
This commit is contained in:
parent
cbc3788eec
commit
bce8b80a88
BIN
msvc/diff.exe
BIN
msvc/diff.exe
Binary file not shown.
Binary file not shown.
@ -1,5 +1,12 @@
|
||||
#! /bin/sh
|
||||
# Test driver for exiv2 utility tests
|
||||
|
||||
os=`uname`
|
||||
if [ "${os:0:4}" == "CYGW" ]; then
|
||||
# use the diff.exe in msvc (cygwin's default diff is suspect)
|
||||
export PATH=$PWD/../msvc:$PATH
|
||||
fi
|
||||
|
||||
export LC_ALL=C
|
||||
if [ -z "$EXIV2_BINDIR" ] ; then
|
||||
bin="$VALGRIND ../../src"
|
||||
@ -126,7 +133,7 @@ diff iii kkk
|
||||
|
||||
) > $results 2>&1
|
||||
|
||||
if [ `../config/config.guess` = "i686-pc-mingw32" ] ; then
|
||||
if [ -e `which dos2unix` ]; then
|
||||
sed 's,\\,/,g' $results > ${results}-new
|
||||
mv -f ${results}-new $results
|
||||
unix2dos $results >/dev/null 2>&1
|
||||
|
||||
Loading…
Reference in New Issue
Block a user