1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
|
From: Amos Jeffries <amosjeffries@squid-cache.org>
Date: Sat, 21 Jul 2018 21:07:00 +1300
Subject: Use installed squid binary for Debian CI testing
Index: pkg-squid/test-suite/Makefile.am
===================================================================
--- pkg-squid.orig/test-suite/Makefile.am
+++ pkg-squid/test-suite/Makefile.am
@@ -150,7 +150,7 @@ VirtualDeleteOperator_SOURCES = VirtualD
squid-conf-tests: $(top_builddir)/src/squid.conf.default $(srcdir)/squidconf/*
@failed=0; cfglist="$?"; rm -f $@ || $(TRUE); \
for cfg in $$cfglist ; do \
- $(top_builddir)/src/squid -k parse -f $$cfg || \
+ /usr/sbin/squid -k parse -f $$cfg || \
{ echo "FAIL: squid.conf test: $$cfg" | \
sed s%$(top_builddir)/src/%% | \
sed s%$(srcdir)/squidconf/%% ; \
Index: pkg-squid/test-suite/Makefile.in
===================================================================
--- pkg-squid.orig/test-suite/Makefile.in
+++ pkg-squid/test-suite/Makefile.in
@@ -1477,7 +1477,7 @@ STUB.h: $(top_srcdir)/src/tests/STUB.h
squid-conf-tests: $(top_builddir)/src/squid.conf.default $(srcdir)/squidconf/*
@failed=0; cfglist="$?"; rm -f $@ || $(TRUE); \
for cfg in $$cfglist ; do \
- $(top_builddir)/src/squid -k parse -f $$cfg || \
+ /usr/sbin/squid -k parse -f $$cfg || \
{ echo "FAIL: squid.conf test: $$cfg" | \
sed s%$(top_builddir)/src/%% | \
sed s%$(srcdir)/squidconf/%% ; \
|
