From 50e53e893b3476f596d35a77999bf8c39ad093f0 Mon Sep 17 00:00:00 2001 From: Robin Mills Date: Tue, 18 Oct 2016 18:27:07 +0000 Subject: [PATCH] #1230 Fixing issues with test suite on MinGW/32. --- test/bugfixes-test.sh | 6 +++--- test/data/bugfixes-test.out | Bin 1923265 -> 1924585 bytes test/data/stdin-test.out | 30 ------------------------------ test/stdin-test.sh | 2 +- 4 files changed, 4 insertions(+), 34 deletions(-) diff --git a/test/bugfixes-test.sh b/test/bugfixes-test.sh index 8c044532..d549b263 100755 --- a/test/bugfixes-test.sh +++ b/test/bugfixes-test.sh @@ -445,9 +445,9 @@ source ./functions.source runTest exiv2 -pR $filename copyTestFile imagemagick.png runTest exiv2 -pR imagemagick.png - copyTestFile Reagan.tiff - runTest exiv2 -pR Reagan.tiff - copyTestFile Reagan.tiff + copyTestFile ReaganLargeTiff.tiff + runTest exiv2 -pR ReaganLargeTiff.tiff + copyTestFile Reagan.jpg runTest exiv2 -pR Reagan.jpg echo '' diff --git a/test/data/bugfixes-test.out b/test/data/bugfixes-test.out index d4e1ea86c7107a17196405e1ab45afa9456ce762..5cbdc4fc68430af83caf349c61514d190febfdcb 100644 GIT binary patch delta 2490 zcmai0U2GLa6b@~nrLCoZO51xN8w&DMxt*Wg*_kHNmRnj2rL6^tLTW6b5MnHCDTG8) z+PDy+77?YVB7!6e8hl+-{H89jQFuH4S^X{EH(_{1~#w*L9A8#Clq5`&a(8E(7 z&8fp18(=Yd4X_|j2&|ZaHF&um=Hm79P@X4!e0mc!;1dl{Q^_Us4tn$~_T2InelY`P zv81>0lA%v~ZT}LTK;xWoXvNDNP=Md8g3`Q@;htBZ1&6!H30n%KrCQJ-c7SoV!+UAu zyE<%{f_Zp64P|QrbJMoA-W#79+_8J0acp$($-QHHMjHnY?A|Zp=jy%thZ?OV)@tLACQ`}p>LDCmchC8P=%{a0Zi{Y25nv*W4OIM-nVCHXw?@$f{F zewnSDOjMP^A10s~CzeA&B^TP-6iFF*sB!gV;;=@$O88Q1=^4qB^M;|RhfI~$_9#6Y zlRgQCt&c!kl{U%>jLHc(K6V<`;zT!;&ZP!Y``!))0) zIyd%uB5l$^>|F#5Ut0>9C5Brkf^pTvOcR%sLz9qAB24s@z;~aarWmR4#t~{t*BNSx z2z^{Pk-7l~c8a@5&JG@Khf_?OlP7U-m(N zMXZ{D?Kb>>=tF6tQy|#nhM-ymE}cNx@U1u?_~a&{nwm{P(laL}+}N4$;+e1~l$)B| zOgJNiA2$`Y@a!lx+LSYT9B72mI5UyTRGZK- zNOFi|k~6$Eky7O$mjRVBUM5r+Or};8xu247*>)Jh3^%rSZfVZ#KF~%7!uL2QJaM1V zK+sR=3z|c%3}>N`!sCX-noH$-`1l8K1b^y*`S|@2ScWqfA;R@XVQao5s{3pUG&__i zKN)F3JAAbdQvZW32T0`@g&oks4B+I6R0{j+Aw{hdlDW_WCWLMjjvQPK1AOr;v^WjU zY-vbCs@WO}|2UhBXbcpk8UD4L2;|#mp<jI<a)T?mV+*<++`>P{p=Lq$van9H@bUT^@L;XQ7nd=qv)q_z;;Y^_?=JQ= zzV#ns#iq|wcJH-8MVv(_@X8CxaK(+)+Q-G~U={WrhZ_9nJe0+nMj;={zV5w{yf)P6 z2ilXG7^3*kFW8HF8x%SYaCe|h%SeI048i@=9k9Z+p6KmZ2lP1GCQ!KQ#4RIE-j3~o zcBIQH?u;S4jlAs`NXWp%APvQAkQ#&69)k7?OFqh7XBI__(6?q7x~*5qIG*W@y-LCr zHolw{_}H~RDd#$~_T^0kwqhq6e9c#U=f$bItZe;;M#6%x1lhe?=%to(>M3Ng`isCzP M-6uaz!>^bA1%=0X8UO$Q delta 1588 zcmYjRTTGlq6wY?JRA?!bOSkMne}!TxDV@uI8=~BiR)s>FDz>0*l?sXMk`@#bDm0k~ zla`{1a%{_`NtIaaMdF161ov#b@R$Zuzbg?ec+jLBC*QGlC z37j3nl^)34bf7QsQX*M1JaFt-4&L4Yz39!tA^c}7-hkiDLNWd_3$58w`qr4`<2xtg z`?04V3h?if@gDqZ4jze0+r=-(VK*k`;jv85Vb&Nv=$94Z*Yl8t-_Ap8%yZ51j(tz; z@32~UcaCK~&Rnc{1L|YOv|X1nf-xQCK3;sCK+taaQ7#!icM2MCvfFsJz&o@Ozn_J| zD0gg}8IL!_Xf$pjW4E-_F0|%so~U#{?w4we9&r7yfBb7Zn(b?F3wg! z^FzKc3k2h$mf5w;v$$K!d9Co$dD6$+OVAwkZ5z8T!S3zCoTSA@8Fz%$Iy!tjaWFAB z^m5+`j9i1-sBi_oI}ulC%|T9yA9Tm9;FqrG+4#pq+|9QY_ttRxzKhPO_|A<%8-l#@ z)8I7-DOXb*pBbdKt9*yKgxV3DxN>DMr6d>3lG1T(x{9za>apeYN;NUXEu>1xz;pC@qBr24T zH=ly0T;==b1k8XR&485^Y896z;b=C&r+~m`--E_d&LlVN2IDG?6jwG*Rfcg9>Pw0> znk}VBf$iO-Dx>HOrATu39wztd`%pwKX>NQ9>S-&gD{b7o0A(~y;$sWYm`RhQy!0el zWmQmzKQ2IVo>GCD*{I@7SQzP#l;Zg+C^I-cbGE^_j#GI)-mVI9`XY?`;(u|)@b2L- zu0nxJ#a82-v@Y!C?6OZ(%YNd*3W4mtv<2*swCf@w*-JiQc1#U@^UIuCYU_|gWKPjZGk zFMw<&PjcG`BluiT8hkZ1HG7{NNTz748B7izKhV}>bw6|1%m<$_!ef(ks&f~hzBG7A X?T}mB_H$Z0TCDKWEN_^BUvK>fMPjF5 diff --git a/test/data/stdin-test.out b/test/data/stdin-test.out index 70fe6822..c051f728 100644 --- a/test/data/stdin-test.out +++ b/test/data/stdin-test.out @@ -149,36 +149,6 @@ STRUCTURE OF JPEG FILE: girl.jpg 372 | 0xffe1 APP1 | 4613 | http://ns.adobe.com/xap/1.0/.&3 - for f in Reagan.jpg Reagan.tiff ReaganLargeTiff.tiff ReaganSmallPng.png; do + for f in Reagan.jpg ReaganLargeTiff.tiff ReaganSmallPng.png; do copyTestFile $f copyTestFile exiv2-bug1229.jpg girl.jpg runTest exiv2 -pS girl.jpg