1*4882a593SmuzhiyunFrom 8786b91488dae3f6dfeadd686e80d2ffc5c29320 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Jackie Huang <jackie.huang@windriver.com> 3*4882a593SmuzhiyunDate: Thu, 25 Aug 2016 15:22:57 +0800 4*4882a593SmuzhiyunSubject: [PATCH] squid: don't do squid-conf-tests at build time 5*4882a593Smuzhiyun 6*4882a593Smuzhiyun* squid-conf-tests is a test to run "squid -k parse -f" 7*4882a593Smuzhiyun to perse the config files, which should not be run 8*4882a593Smuzhiyun at build time since we are cross compiling, so remove 9*4882a593Smuzhiyun it but it will be added back for the runtime ptest. 10*4882a593Smuzhiyun 11*4882a593Smuzhiyun* Fix the directories of the conf files for squid-conf-tests 12*4882a593Smuzhiyun so that it can run on the target board. 13*4882a593Smuzhiyun 14*4882a593SmuzhiyunUpstream-Status: Inappropriate [cross compile specific] 15*4882a593Smuzhiyun 16*4882a593SmuzhiyunSigned-off-by: Jackie Huang <jackie.huang@windriver.com> 17*4882a593Smuzhiyun 18*4882a593Smuzhiyun--- 19*4882a593Smuzhiyun test-suite/Makefile.am | 15 +++++++-------- 20*4882a593Smuzhiyun 1 file changed, 7 insertions(+), 8 deletions(-) 21*4882a593Smuzhiyun 22*4882a593Smuzhiyundiff --git a/test-suite/Makefile.am b/test-suite/Makefile.am 23*4882a593Smuzhiyunindex 061a463..350dfb2 100644 24*4882a593Smuzhiyun--- a/test-suite/Makefile.am 25*4882a593Smuzhiyun+++ b/test-suite/Makefile.am 26*4882a593Smuzhiyun@@ -41,8 +41,7 @@ TESTS += debug \ 27*4882a593Smuzhiyun MemPoolTest\ 28*4882a593Smuzhiyun mem_node_test\ 29*4882a593Smuzhiyun mem_hdr_test\ 30*4882a593Smuzhiyun- $(ESI_TESTS) \ 31*4882a593Smuzhiyun- squid-conf-tests 32*4882a593Smuzhiyun+ $(ESI_TESTS) 33*4882a593Smuzhiyun 34*4882a593Smuzhiyun ## Sort by alpha - any build failures are significant. 35*4882a593Smuzhiyun check_PROGRAMS += debug \ 36*4882a593Smuzhiyun@@ -125,19 +124,19 @@ VirtualDeleteOperator_SOURCES = VirtualDeleteOperator.cc $(DEBUG_SOURCE) 37*4882a593Smuzhiyun ##$(TARGLIB): $(LIBOBJS) 38*4882a593Smuzhiyun ## $(AR_R) $(TARGLIB) $(LIBOBJS) 39*4882a593Smuzhiyun 40*4882a593Smuzhiyun-squid-conf-tests: $(top_builddir)/src/squid.conf.default $(srcdir)/squidconf/* 41*4882a593Smuzhiyun+squid-conf-tests: $(sysconfdir)/squid.conf.default squidconf/* 42*4882a593Smuzhiyun @failed=0; cfglist="$?"; rm -f $@ || $(TRUE); \ 43*4882a593Smuzhiyun for cfg in $$cfglist ; do \ 44*4882a593Smuzhiyun- $(top_builddir)/src/squid -k parse -f $$cfg || \ 45*4882a593Smuzhiyun+ squid -k parse -f $$cfg || \ 46*4882a593Smuzhiyun { echo "FAIL: squid.conf test: $$cfg" | \ 47*4882a593Smuzhiyun- sed s%$(top_builddir)/src/%% | \ 48*4882a593Smuzhiyun- sed s%$(srcdir)/squidconf/%% ; \ 49*4882a593Smuzhiyun+ sed s%$(sysconfdir)/%% | \ 50*4882a593Smuzhiyun+ sed s%squidconf/%% ; \ 51*4882a593Smuzhiyun failed=1; break; \ 52*4882a593Smuzhiyun }; \ 53*4882a593Smuzhiyun if test "$$failed" -eq 0; then \ 54*4882a593Smuzhiyun echo "PASS: squid.conf test: $$cfg" | \ 55*4882a593Smuzhiyun- sed s%$(top_builddir)/src/%% | \ 56*4882a593Smuzhiyun- sed s%$(srcdir)/squidconf/%% ; \ 57*4882a593Smuzhiyun+ sed s%$(sysconfdir)/%% | \ 58*4882a593Smuzhiyun+ sed s%squidconf/%% ; \ 59*4882a593Smuzhiyun else break; fi; \ 60*4882a593Smuzhiyun done; \ 61*4882a593Smuzhiyun if test "$$failed" -eq 0; then cp $(TRUE) $@ ; fi 62