Gitiles
Code Review Sign In
gerrit.openbmc.org / openbmc / openbmc / 87f5cff0cfca11f43851cb3d7d49dd96ced7fe03 / . / meta-openembedded / meta-networking / recipes-daemons / squid / files / squid-don-t-do-squid-conf-tests-at-build-time.patch
blob: ea27285e09d0a0c68347117391a2a6aaa4834228 [file] [log] [blame]
Brad Bishop316dfdd2018-06-25 12:45:53 -0400[diff] [blame]1From 8786b91488dae3f6dfeadd686e80d2ffc5c29320 Mon Sep 17 00:00:00 2001
Patrick Williamsddad1a12017-02-23 20:36:32 -0600[diff] [blame]2From: Jackie Huang <jackie.huang@windriver.com>
3Date: Thu, 25 Aug 2016 15:22:57 +0800
4Subject: [PATCH] squid: don't do squid-conf-tests at build time
5
6* squid-conf-tests is a test to run "squid -k parse -f"
7 to perse the config files, which should not be run
8 at build time since we are cross compiling, so remove
9 it but it will be added back for the runtime ptest.
10
11* Fix the directories of the conf files for squid-conf-tests
12 so that it can run on the target board.
13
14Upstream-Status: Inappropriate [cross compile specific]
15
16Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Brad Bishop316dfdd2018-06-25 12:45:53 -0400[diff] [blame]17
Patrick Williamsddad1a12017-02-23 20:36:32 -0600[diff] [blame]18---
19 test-suite/Makefile.am | 15 +++++++--------
20 1 file changed, 7 insertions(+), 8 deletions(-)
21
22diff --git a/test-suite/Makefile.am b/test-suite/Makefile.am
Andrew Geissler87f5cff2022-09-30 13:13:31 -0500[diff] [blame^]23index 0233c0e..e0021b6 100644
Patrick Williamsddad1a12017-02-23 20:36:32 -0600[diff] [blame]24--- a/test-suite/Makefile.am
25+++ b/test-suite/Makefile.am
Andrew Geissler87f5cff2022-09-30 13:13:31 -0500[diff] [blame^]26@@ -40,8 +40,7 @@ TESTS += debug \
27 splay\
Patrick Williamsddad1a12017-02-23 20:36:32 -0600[diff] [blame]28 mem_node_test\
29 mem_hdr_test\
30- $(ESI_TESTS) \
31- squid-conf-tests
32+ $(ESI_TESTS)
33
34 ## Sort by alpha - any build failures are significant.
35 check_PROGRAMS += debug \
Andrew Geissler87f5cff2022-09-30 13:13:31 -0500[diff] [blame^]36@@ -159,19 +158,19 @@ VirtualDeleteOperator_SOURCES = \
Patrick Williamsddad1a12017-02-23 20:36:32 -0600[diff] [blame]37 ##$(TARGLIB): $(LIBOBJS)
38 ## $(AR_R) $(TARGLIB) $(LIBOBJS)
39
40-squid-conf-tests: $(top_builddir)/src/squid.conf.default $(srcdir)/squidconf/*
41+squid-conf-tests: $(sysconfdir)/squid.conf.default squidconf/*
42 @failed=0; cfglist="$?"; rm -f $@ || $(TRUE); \
43 for cfg in $$cfglist ; do \
44- $(top_builddir)/src/squid -k parse -f $$cfg || \
45+ squid -k parse -f $$cfg || \
46 { echo "FAIL: squid.conf test: $$cfg" | \
47- sed s%$(top_builddir)/src/%% | \
48- sed s%$(srcdir)/squidconf/%% ; \
49+ sed s%$(sysconfdir)/%% | \
50+ sed s%squidconf/%% ; \
51 failed=1; break; \
52 }; \
53 if test "$$failed" -eq 0; then \
54 echo "PASS: squid.conf test: $$cfg" | \
55- sed s%$(top_builddir)/src/%% | \
56- sed s%$(srcdir)/squidconf/%% ; \
57+ sed s%$(sysconfdir)/%% | \
58+ sed s%squidconf/%% ; \
59 else break; fi; \
60 done; \
61 if test "$$failed" -eq 0; then cp $(TRUE) $@ ; fi