From: Amos Jeffries <>
Date: Mon, 10 Apr 2017 04:12:10 +0000 (+1200)
Subject: Revert r15115
X-Git-Tag: M-staged-PR71~200
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=075829a0a6c08a6f9a01ab13be7de1816db8675d;p=thirdparty%2Fsquid.git

Revert r15115

Seems I missed something vital in the testing of this.
---

diff --git a/test-suite/Makefile.am b/test-suite/Makefile.am
index 3c1e9ff6b6..df2fbca8ba 100644
--- a/test-suite/Makefile.am
+++ b/test-suite/Makefile.am
@@ -142,9 +142,8 @@ VirtualDeleteOperator_SOURCES = VirtualDeleteOperator.cc stub_libmem.cc $(DEBUG_
 
 squid-conf-tests: $(top_builddir)/src/squid.conf.default $(srcdir)/squidconf/*
 	@failed=0; cfglist="$?"; rm -f $@ || $(TRUE); \
-	test "x$(BIN_DIR)" = "x" && BIN_DIR="$(top_builddir)/src/" || $(TRUE); \
 	for cfg in $$cfglist ; do \
-		$(BIN_DIR)/squid -k parse -f $$cfg || \
+		$(top_builddir)/src/squid -k parse -f $$cfg || \
 			{ echo "FAIL: squid.conf test: $$cfg" | \
 				sed s%$(top_builddir)/src/%% | \
 				sed s%$(srcdir)/squidconf/%% ; \