]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
Revert r15115
authorAmos Jeffries <>
Mon, 10 Apr 2017 04:12:10 +0000 (16:12 +1200)
committerAmos Jeffries <>
Mon, 10 Apr 2017 04:12:10 +0000 (16:12 +1200)
Seems I missed something vital in the testing of this.

test-suite/Makefile.am

index 3c1e9ff6b68b417c7e0c003565281c85b81aaf8d..df2fbca8ba31dd370de9f1e7965ec39ad07a3a14 100644 (file)
@@ -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/%% ; \