From a34fe6ea8a865ca9bcac2f85c10ea8edbe69ed61 Mon Sep 17 00:00:00 2001 From: Wouter Wijngaards Date: Mon, 16 Aug 2010 12:59:37 +0000 Subject: [PATCH] - make test more portable (make longtest needs special support programs, ldns, wdiff, dig, port-numbers). - moved not-always-portable testbound scripts to names .crpl. git-svn-id: file:///svn/unbound/trunk@2214 be551aaa-1e26-0410-a405-d3ace91eadb9 --- Makefile.in | 12 ++++++++++-- doc/Changelog | 2 ++ testdata/03-testbound.tpkg | Bin 1194 -> 1271 bytes .../{val_ds_gost.rpl => val_ds_gost.crpl} | 0 ...wngrade.rpl => val_ds_gost_downgrade.crpl} | 0 .../{val_ds_sha2.rpl => val_ds_sha2.crpl} | 0 ...wngrade.rpl => val_ds_sha2_downgrade.crpl} | 0 7 files changed, 12 insertions(+), 2 deletions(-) rename testdata/{val_ds_gost.rpl => val_ds_gost.crpl} (100%) rename testdata/{val_ds_gost_downgrade.rpl => val_ds_gost_downgrade.crpl} (100%) rename testdata/{val_ds_sha2.rpl => val_ds_sha2.crpl} (100%) rename testdata/{val_ds_sha2_downgrade.rpl => val_ds_sha2_downgrade.crpl} (100%) diff --git a/Makefile.in b/Makefile.in index 7a0ff4e2e..aabd0f118 100644 --- a/Makefile.in +++ b/Makefile.in @@ -179,7 +179,7 @@ COMPILE=$(LIBTOOL) --tag=CC --mode=compile $(CC) $(CPPFLAGS) $(CFLAGS) LINK=$(LIBTOOL) --tag=CC --mode=link $(strip $(CC) $(staticexe) $(RUNTIME_PATH) $(CFLAGS) $(LDFLAGS)) LINK_LIB=$(LIBTOOL) --tag=CC --mode=link $(strip $(CC) $(RUNTIME_PATH) $(CFLAGS) $(LDFLAGS) $(staticexe) -version-number @LIBUNBOUND_CURRENT@:@LIBUNBOUND_REVISION@:@LIBUNBOUND_AGE@ -no-undefined) -.PHONY: clean realclean doc lint all install uninstall tests test download_ldns strip lib +.PHONY: clean realclean doc lint all install uninstall tests test download_ldns strip lib longtest longcheck check $(BUILD)%.lo: $(srcdir)/%.c $(INFO) Build $< @@ -194,7 +194,15 @@ TEST_BIN=$(addsuffix $(EXEEXT),asynclook delayer harvest lock-verify \ memstats perf pktview signit streamtcp testbound unittest) tests: all $(TEST_BIN) -test: tests +check: test +longcheck: longtest + +test: unittest$(EXEEXT) testbound$(EXEEXT) + ./unittest$(EXEEXT) + for x in testdata/*.rpl; do if ./testbound$(EXEEXT) -p $$x >/dev/null 2>&1; then echo $$x OK; else echo $$x failed; exit 1; fi done + @echo test OK + +longtest: tests if test -x "`which bash`"; then bash testcode/do-tests.sh; else sh testcode/do-tests.sh; fi lib: libunbound.la diff --git a/doc/Changelog b/doc/Changelog index 024ddec99..444377abd 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -1,6 +1,8 @@ 16 August 2010: Wouter - Fix acx_nlnetlabs.m4 configure output for autoconf-2.66 AS_TR_CPP changes, uses m4_bpatsubst now. + - make test (or make check) should be more portable and run the unit + test and testbound scripts. (make longtest has special requirements). 13 August 2010: Wouter - More pleasant remote control command parsing. diff --git a/testdata/03-testbound.tpkg b/testdata/03-testbound.tpkg index 432e942643d817bbe5ccc3a9bcd0f20a27a74abc..30a18456414f39bb8d129289cbed4b38c9cce48d 100644 GIT binary patch literal 1271 zc-jH?1PJ>diwFQ1HEB!$1MOE^Z`(E$_N(|S4&)^l%T*qmPE=kb_+ruz4 zjC5>kkws0Uasl?^cSu^kB~CgZ?XXoJU|S~7k$w(wU z@Vy2*LK$RHs?5TtJb{HA;58-+GE8HB2Qt8fXOWN|8)nG0{1I1V`aDNC#!K*9;CFki zZqNS-hNE+6QXjAr9wmxinDrpcJowccdIS21{zxXAXQ5<6GBOd_T@Tn$%uyBpWb1d_SnY^=}kzIJ14U1(Ruob4f5OLC`PUGkxPkTj~(+U&b8*hU6t>L z$IrihdIlelpZ`vy)7+T<-EOB{p8xNGDpYH=`=i!l^Xi^TuO=Red2@~5;l+!>&;$GAC6~0bST^p*B7?{d8tpRT zm*g^~V;UusxvO=BH7{#hjD7qx>bu&t=dzQ*hf#mVuaHG!iXjT7FwtM(pdR9NJ;~!3 zng=iZeH~T;M%)POQ`l@T2w{iJ!9MKht>q+q$?!H(*F5ewD55{}2vy&8K?yL{uQ9t6 z5*Z7{7ZRFeQ4;nOL88Ssn28Wg+#z1(6ILaD6B?}GQiG}}z+3Fs?4xTq)KAE;DaC`- zS=Av6wwAZxUf5U*Zx`-D%2}m!hmw{k(ki`l17JKhtpR&^5-Dp>j923>yzH#lfj+oo zs&Jy2>@D^T`Q;T-lW?GDs^`kGe_1Fw7)%9)PZW#;fU^$(E^{!ZOy1i*9=!i~bmZy{ zss#8#h;T+r0~EFoIdjn5TmzJ;rG`qrk--UCV7;Pk9{)77W)>x1tF zSsI(XBtij?Z}^=AnWw496vf7gO`@|HOfk5k<7s;M^SeQ_(>0rK&pw~)PO=(aVO1NI zQ<29Z+=%Q7L_*T^8{&?J!VLDbtUmNFJ!WS?N@bvwE%Fd@#p|z(nawp#cppN+94dH- zS^vUh{PS>hI{5Vd?8}?c+xMriV{QJWyMhwx)05QAfUqm;8?yEK?gev9p^aAm!X$BF zVy@`Q!*wo)hwcSqPL<&-zKHXrG2cExsKYE_%~ zrT;|@b?I$uIDtr1l;rwZpB~)?YwUF~zmofeetrED?vuy47oNYC_1BE0$LCU7)OX8x znja*4yjC;NgB{y=?g~dMY!BO3VW+r6{COzfcz&%7unnsBM%W5z!}Wd1@yC zt9PLD;DB3Zf9st49tD`+A@&{}LvFIKG9IAUm=l3H7EP^1YINgAPJh5CbWCj9yd0o|2T!QWv~n7dCVdG$uhraU}rA$1N|o|QKCeN h5+zEMC{dzBi4rABlqgZ6M2Y_c{syi%>IwiT006$Qdj$Xh literal 1194 zc-jG~1XcSViwFQ|S6NH|1MOGoZ{kK2=d0(hcrqx-u7trHPDMmkEFrtmHiwd^{ZLiQ zU=J{j@pxzK98&-IzVX2sl2l4kRqLMwHZ$+|y&jjU$X0Mr`2q?Ta6~x-)T8^3F@!l`&sl{}1+h08dAxg4-t7DOOf=+g&KE(@sSLRq9Q8P)PfG(ywYF@s|^0=o&e(`h;# z`xodBuAzZ_Ku#$SBK$Df0Z&@+yVbXPc;SBq6H2A0NFR+%gnZ}#>5Ew?0`%D-{h4>f zLKb)m*B5tRnICq@g=F|86v|yA+12PQeMfrn{W15M*14ccF|R|8DfeTo`CnJ%{qXep z*LSbrp=z0!2wkC)?yNVAncw;x76>}F`^$aXHnNQArg>Szh!bH6eGkF z-%)5HdEj*efui{@mX0O>nS+i47WYm))~&HN7oRs2G>ZEL- zg|wFUU=Gt*b8ka)E@doJdSD8dFw!!9bOSJdoU{h)#Q~2}dt$sCckZRKWCyxnqN&`8 zX0kWmOUN%CAyoy35l;0uO4)zNl?>)i1%{6l5(fb1-vCTvFds9yv3=Y-`E_t)>J6*} z*hGh6%(K|T>`WOAVdM+=0H0A@rnnjk>@#dQ3+tB>dpyI2(E%uf zi<-e2t5Y_^2UcPe9bhNtG&R4J5H9M*rx9qrxvN$BsZE`|N0PS2=~eTlt54EH7-Ia$ zbxy#e5v_f+WauA&Cy0Sb^_c7qlc=uxgR|b{$@%xsgD)p%P)XJQ)|p4rHr^?na0a`o zwkBJv?GA~NBs0)~sm@FK3_wm9+89C61|Z+R$5tjeJns zStxHjBUXmQ8r6+4u|zuI`pl@AfKI!oT80NI>QpH*Xslk7*5 zy3DF)L?FYwskKNIpQ?QPu%hsBO<}HBPPr}XrM;VG;7&*^ftB#%UA}ObgtlSrX=7u2 zkI0QJf}Ja8F?;wTll*IdN+$FZy>}ESP@q780tE^bC{Un4fdT~z6ev)jK!LZ#Kb`{n I^#CXU0QBKW+5i9m diff --git a/testdata/val_ds_gost.rpl b/testdata/val_ds_gost.crpl similarity index 100% rename from testdata/val_ds_gost.rpl rename to testdata/val_ds_gost.crpl diff --git a/testdata/val_ds_gost_downgrade.rpl b/testdata/val_ds_gost_downgrade.crpl similarity index 100% rename from testdata/val_ds_gost_downgrade.rpl rename to testdata/val_ds_gost_downgrade.crpl diff --git a/testdata/val_ds_sha2.rpl b/testdata/val_ds_sha2.crpl similarity index 100% rename from testdata/val_ds_sha2.rpl rename to testdata/val_ds_sha2.crpl diff --git a/testdata/val_ds_sha2_downgrade.rpl b/testdata/val_ds_sha2_downgrade.crpl similarity index 100% rename from testdata/val_ds_sha2_downgrade.rpl rename to testdata/val_ds_sha2_downgrade.crpl -- 2.47.2