See <http://build.squid-cache.org/job/3.HEAD-i386-Debian-sid/18/changes>

Changes:

[Henrik Nordstrom <hen...@henriknordstrom.net>] Don't use C++ // comments in C 
files

[Henrik Nordstrom <hen...@henriknordstrom.net>] Populate cache_mem again on 
disk cache hits, moving on-disk objects back
into the hot object pool.

This adds a new squid.conf option for tuning when to keep objects in memory.

Sponsored by: The Measurement Factory

------------------------------------------
[...truncated 3714 lines...]
Testing ../../../src/acl/SslErrorData.h ...OK.
Testing ../../../src/acl/SslError.h ...OK.
Testing ../../../src/acl/Strategised.h ...OK.
Testing ../../../src/acl/Strategy.h ...OK.
Testing ../../../src/acl/StringData.h ...OK.
Testing ../../../src/acl/Tag.h ...OK.
Testing ../../../src/acl/TimeData.h ...OK.
Testing ../../../src/acl/Time.h ...OK.
Testing ../../../src/acl/Url.h ...OK.
Testing ../../../src/acl/UrlPath.h ...OK.
Testing ../../../src/acl/UrlPort.h ...OK.
Testing ../../../src/acl/UserData.h ...OK.
PASS: testHeaders
=============
1 test passed
=============
make[5]: Leaving directory 
`<http://build.squid-cache.org/job/3.HEAD-i386-Debian-sid/ws/btlayer-00-default/squid-3.HEAD-BZR/_build/src/acl'>
make[4]: Leaving directory 
`<http://build.squid-cache.org/job/3.HEAD-i386-Debian-sid/ws/btlayer-00-default/squid-3.HEAD-BZR/_build/src/acl'>
Making check in fs
make[4]: Entering directory 
`<http://build.squid-cache.org/job/3.HEAD-i386-Debian-sid/ws/btlayer-00-default/squid-3.HEAD-BZR/_build/src/fs'>
make  
make[5]: Entering directory 
`<http://build.squid-cache.org/job/3.HEAD-i386-Debian-sid/ws/btlayer-00-default/squid-3.HEAD-BZR/_build/src/fs'>
make[5]: Nothing to be done for `all'.
make[5]: Leaving directory 
`<http://build.squid-cache.org/job/3.HEAD-i386-Debian-sid/ws/btlayer-00-default/squid-3.HEAD-BZR/_build/src/fs'>
make  check-TESTS
make[5]: Entering directory 
`<http://build.squid-cache.org/job/3.HEAD-i386-Debian-sid/ws/btlayer-00-default/squid-3.HEAD-BZR/_build/src/fs'>
/bin/sh ../../../test-suite/testheaders.sh "g++ -DHAVE_CONFIG_H  -I../../.. 
-I../../../include -I../../../src -I../../include  -I../../../src/fs  
-I/usr/include/libxml2  -Werror -Wall -Wpointer-arith -Wwrite-strings 
-Wcomments  -g -O2" "../../../src/fs/ufs" || exit 1
Testing ../../../src/fs/ufs/StoreFSufs.h ...OK.
Testing ../../../src/fs/ufs/ufscommon.h ...OK.
/bin/sh ../../../test-suite/testheaders.sh "g++ -DHAVE_CONFIG_H  -I../../.. 
-I../../../include -I../../../src -I../../include  -I../../../src/fs  
-I/usr/include/libxml2  -Werror -Wall -Wpointer-arith -Wwrite-strings 
-Wcomments  -g -O2" "../../../src/fs/coss" || exit 1
Testing ../../../src/fs/coss/CossSwapDir.h ...OK.
Testing ../../../src/fs/coss/store_coss.h ...OK.
Testing ../../../src/fs/coss/StoreFScoss.h ...OK.
PASS: testHeaders
=============
1 test passed
=============
make[5]: Leaving directory 
`<http://build.squid-cache.org/job/3.HEAD-i386-Debian-sid/ws/btlayer-00-default/squid-3.HEAD-BZR/_build/src/fs'>
make[4]: Leaving directory 
`<http://build.squid-cache.org/job/3.HEAD-i386-Debian-sid/ws/btlayer-00-default/squid-3.HEAD-BZR/_build/src/fs'>
Making check in repl
make[4]: Entering directory 
`<http://build.squid-cache.org/job/3.HEAD-i386-Debian-sid/ws/btlayer-00-default/squid-3.HEAD-BZR/_build/src/repl'>
make  
make[5]: Entering directory 
`<http://build.squid-cache.org/job/3.HEAD-i386-Debian-sid/ws/btlayer-00-default/squid-3.HEAD-BZR/_build/src/repl'>
make[5]: Nothing to be done for `all'.
make[5]: Leaving directory 
`<http://build.squid-cache.org/job/3.HEAD-i386-Debian-sid/ws/btlayer-00-default/squid-3.HEAD-BZR/_build/src/repl'>
make  check-TESTS
make[5]: Entering directory 
`<http://build.squid-cache.org/job/3.HEAD-i386-Debian-sid/ws/btlayer-00-default/squid-3.HEAD-BZR/_build/src/repl'>
/bin/sh ../../../test-suite/testheaders.sh "g++ -DHAVE_CONFIG_H  -I../../.. 
-I../../../include -I../../../src -I../../include  -I../../../src/repl  
-I/usr/include/libxml2  -Werror -Wall -Wpointer-arith -Wwrite-strings 
-Wcomments  -g -O2" "../../../src/repl/heap" || exit 1
Testing ../../../src/repl/heap/store_heap_replacement.h ...OK.
PASS: testHeaders
=============
1 test passed
=============
make[5]: Leaving directory 
`<http://build.squid-cache.org/job/3.HEAD-i386-Debian-sid/ws/btlayer-00-default/squid-3.HEAD-BZR/_build/src/repl'>
make[4]: Leaving directory 
`<http://build.squid-cache.org/job/3.HEAD-i386-Debian-sid/ws/btlayer-00-default/squid-3.HEAD-BZR/_build/src/repl'>
Making check in auth
make[4]: Entering directory 
`<http://build.squid-cache.org/job/3.HEAD-i386-Debian-sid/ws/btlayer-00-default/squid-3.HEAD-BZR/_build/src/auth'>
make  
make[5]: Entering directory 
`<http://build.squid-cache.org/job/3.HEAD-i386-Debian-sid/ws/btlayer-00-default/squid-3.HEAD-BZR/_build/src/auth'>
make[5]: Nothing to be done for `all'.
make[5]: Leaving directory 
`<http://build.squid-cache.org/job/3.HEAD-i386-Debian-sid/ws/btlayer-00-default/squid-3.HEAD-BZR/_build/src/auth'>
make  check-TESTS
make[5]: Entering directory 
`<http://build.squid-cache.org/job/3.HEAD-i386-Debian-sid/ws/btlayer-00-default/squid-3.HEAD-BZR/_build/src/auth'>
/bin/sh ../../../test-suite/testheaders.sh "g++ -DHAVE_CONFIG_H  -I../../.. 
-I../../../include -I../../../src -I../../include  -I../../../src/auth  
-I/usr/include/libxml2  -Werror -Wall -Wpointer-arith -Wwrite-strings 
-Wcomments  -g -O2" "../../../src/auth/" || exit 1
Testing ../../../src/auth//Acl.h ...OK.
Testing ../../../src/auth//AclMaxUserIp.h ...OK.
Testing ../../../src/auth//AclProxyAuth.h ...OK.
Testing ../../../src/auth//Config.h ...OK.
Testing ../../../src/auth//Gadgets.h ...OK.
Testing ../../../src/auth//Scheme.h ...OK.
Testing ../../../src/auth//User.h ...OK.
Testing ../../../src/auth//UserRequest.h ...OK.
/bin/sh ../../../test-suite/testheaders.sh "g++ -DHAVE_CONFIG_H  -I../../.. 
-I../../../include -I../../../src -I../../include  -I../../../src/auth  
-I/usr/include/libxml2  -Werror -Wall -Wpointer-arith -Wwrite-strings 
-Wcomments  -g -O2" "../../../src/auth/basic" || exit 1
Testing ../../../src/auth/basic/auth_basic.h ...OK.
Testing ../../../src/auth/basic/basicScheme.h ...OK.
/bin/sh ../../../test-suite/testheaders.sh "g++ -DHAVE_CONFIG_H  -I../../.. 
-I../../../include -I../../../src -I../../include  -I../../../src/auth  
-I/usr/include/libxml2  -Werror -Wall -Wpointer-arith -Wwrite-strings 
-Wcomments  -g -O2" "../../../src/auth/digest" || exit 1
Testing ../../../src/auth/digest/auth_digest.h ...OK.
Testing ../../../src/auth/digest/digestScheme.h ...OK.
/bin/sh ../../../test-suite/testheaders.sh "g++ -DHAVE_CONFIG_H  -I../../.. 
-I../../../include -I../../../src -I../../include  -I../../../src/auth  
-I/usr/include/libxml2  -Werror -Wall -Wpointer-arith -Wwrite-strings 
-Wcomments  -g -O2" "../../../src/auth/ntlm" || exit 1
Testing ../../../src/auth/ntlm/auth_ntlm.h ...OK.
Testing ../../../src/auth/ntlm/ntlmScheme.h ...OK.
/bin/sh ../../../test-suite/testheaders.sh "g++ -DHAVE_CONFIG_H  -I../../.. 
-I../../../include -I../../../src -I../../include  -I../../../src/auth  
-I/usr/include/libxml2  -Werror -Wall -Wpointer-arith -Wwrite-strings 
-Wcomments  -g -O2" "../../../src/auth/negotiate" || exit 1
Testing ../../../src/auth/negotiate/auth_negotiate.h ...OK.
Testing ../../../src/auth/negotiate/negotiateScheme.h ...OK.
PASS: testHeaders
=============
1 test passed
=============
make[5]: Leaving directory 
`<http://build.squid-cache.org/job/3.HEAD-i386-Debian-sid/ws/btlayer-00-default/squid-3.HEAD-BZR/_build/src/auth'>
make[4]: Leaving directory 
`<http://build.squid-cache.org/job/3.HEAD-i386-Debian-sid/ws/btlayer-00-default/squid-3.HEAD-BZR/_build/src/auth'>
Making check in ip
make[4]: Entering directory 
`<http://build.squid-cache.org/job/3.HEAD-i386-Debian-sid/ws/btlayer-00-default/squid-3.HEAD-BZR/_build/src/ip'>
make  testIpAddress
make[5]: Entering directory 
`<http://build.squid-cache.org/job/3.HEAD-i386-Debian-sid/ws/btlayer-00-default/squid-3.HEAD-BZR/_build/src/ip'>
g++ -DHAVE_CONFIG_H  -I../../.. -I../../../include -I../../../src 
-I../../include   -I/usr/include/libxml2  -Werror -Wall -Wpointer-arith 
-Wwrite-strings -Wcomments  -g -O2 -MT testIpAddress.o -MD -MP -MF 
.deps/testIpAddress.Tpo -c -o testIpAddress.o ../../../src/ip/testIpAddress.cc
mv -f .deps/testIpAddress.Tpo .deps/testIpAddress.Po
g++ -DHAVE_CONFIG_H  -I../../.. -I../../../include -I../../../src 
-I../../include   -I/usr/include/libxml2  -Werror -Wall -Wpointer-arith 
-Wwrite-strings -Wcomments  -g -O2 -MT testMain.o -MD -MP -MF 
.deps/testMain.Tpo -c -o testMain.o `test -f '../tests/testMain.cc' || echo 
'../../../src/ip/'`../tests/testMain.cc
mv -f .deps/testMain.Tpo .deps/testMain.Po
/bin/sh ../../libtool --tag=CXX   --mode=link g++ -Werror -Wall -Wpointer-arith 
-Wwrite-strings -Wcomments  -g -O2 -ldl  -g -o testIpAddress testIpAddress.o 
testMain.o ../../compat/libcompat.la libip.la -L../../lib -lmiscutil -lcppunit 
-ldl 
libtool: link: g++ -Werror -Wall -Wpointer-arith -Wwrite-strings -Wcomments -g 
-O2 -g -o testIpAddress testIpAddress.o testMain.o  
../../compat/.libs/libcompat.a ./.libs/libip.a 
-L<http://build.squid-cache.org/job/3.HEAD-i386-Debian-sid/ws/btlayer-00-default/squid-3.HEAD-BZR/_build/lib>
 -lmiscutil /usr/lib/libcppunit.so -ldl
make[5]: Leaving directory 
`<http://build.squid-cache.org/job/3.HEAD-i386-Debian-sid/ws/btlayer-00-default/squid-3.HEAD-BZR/_build/src/ip'>
make  check-TESTS
make[5]: Entering directory 
`<http://build.squid-cache.org/job/3.HEAD-i386-Debian-sid/ws/btlayer-00-default/squid-3.HEAD-BZR/_build/src/ip'>
/bin/sh ../../../test-suite/testheaders.sh "g++ -DHAVE_CONFIG_H  -I../../.. 
-I../../../include -I../../../src -I../../include   -I/usr/include/libxml2  
-Werror -Wall -Wpointer-arith -Wwrite-strings -Wcomments  -g -O2" 
"../../../src/ip" || exit 1
Testing ../../../src/ip/IpAddress.h ...OK.
Testing ../../../src/ip/IpIntercept.h ...OK.
Testing ../../../src/ip/QosConfig.h ...OK.
Testing ../../../src/ip/testIpAddress.h ...OK.
PASS: testHeaders
.................
OK (17)
PASS: testIpAddress
==================
All 2 tests passed
==================
make[5]: Leaving directory 
`<http://build.squid-cache.org/job/3.HEAD-i386-Debian-sid/ws/btlayer-00-default/squid-3.HEAD-BZR/_build/src/ip'>
make[4]: Leaving directory 
`<http://build.squid-cache.org/job/3.HEAD-i386-Debian-sid/ws/btlayer-00-default/squid-3.HEAD-BZR/_build/src/ip'>
Making check in icmp
make[4]: Entering directory 
`<http://build.squid-cache.org/job/3.HEAD-i386-Debian-sid/ws/btlayer-00-default/squid-3.HEAD-BZR/_build/src/icmp'>
make  testIcmp
make[5]: Entering directory 
`<http://build.squid-cache.org/job/3.HEAD-i386-Debian-sid/ws/btlayer-00-default/squid-3.HEAD-BZR/_build/src/icmp'>
g++ -DHAVE_CONFIG_H -DDEFAULT_CONFIG_FILE=NULL  -I../../.. -I../../../include 
-I../../../src -I../../include   -I/usr/include/libxml2  -Werror -Wall 
-Wpointer-arith -Wwrite-strings -Wcomments  -g -O2 -MT testIcmp.o -MD -MP -MF 
.deps/testIcmp.Tpo -c -o testIcmp.o ../../../src/icmp/testIcmp.cc
mv -f .deps/testIcmp.Tpo .deps/testIcmp.Po
g++ -DHAVE_CONFIG_H -DDEFAULT_CONFIG_FILE=NULL  -I../../.. -I../../../include 
-I../../../src -I../../include   -I/usr/include/libxml2  -Werror -Wall 
-Wpointer-arith -Wwrite-strings -Wcomments  -g -O2 -MT testMain.o -MD -MP -MF 
.deps/testMain.Tpo -c -o testMain.o `test -f '../../../src/tests/testMain.cc' 
|| echo '../../../src/icmp/'`../../../src/tests/testMain.cc
mv -f .deps/testMain.Tpo .deps/testMain.Po
g++ -DHAVE_CONFIG_H -DDEFAULT_CONFIG_FILE=NULL  -I../../.. -I../../../include 
-I../../../src -I../../include   -I/usr/include/libxml2  -Werror -Wall 
-Wpointer-arith -Wwrite-strings -Wcomments  -g -O2 -MT time.o -MD -MP -MF 
.deps/time.Tpo -c -o time.o `test -f '../../../src/time.cc' || echo 
'../../../src/icmp/'`../../../src/time.cc
mv -f .deps/time.Tpo .deps/time.Po
g++ -DHAVE_CONFIG_H -DDEFAULT_CONFIG_FILE=NULL  -I../../.. -I../../../include 
-I../../../src -I../../include   -I/usr/include/libxml2  -Werror -Wall 
-Wpointer-arith -Wwrite-strings -Wcomments  -g -O2 -MT test_tools.o -MD -MP -MF 
.deps/test_tools.Tpo -c -o test_tools.o `test -f 
'../../../test-suite/test_tools.cc' || echo 
'../../../src/icmp/'`../../../test-suite/test_tools.cc
mv -f .deps/test_tools.Tpo .deps/test_tools.Po
g++ -DHAVE_CONFIG_H -DDEFAULT_CONFIG_FILE=NULL  -I../../.. -I../../../include 
-I../../../src -I../../include   -I/usr/include/libxml2  -Werror -Wall 
-Wpointer-arith -Wwrite-strings -Wcomments  -g -O2 -MT globals.o -MD -MP -MF 
.deps/globals.Tpo -c -o globals.o `test -f '../../src/globals.cc' || echo 
'../../../src/icmp/'`../../src/globals.cc
mv -f .deps/globals.Tpo .deps/globals.Po
/bin/sh ../../libtool --tag=CXX   --mode=link g++ -Werror -Wall -Wpointer-arith 
-Wwrite-strings -Wcomments  -g -O2 -ldl  -g -o testIcmp testIcmp.o testMain.o 
time.o test_tools.o globals.o -lcppunit -ldl libicmp-core.la ../ip/libip.la 
../../lib/libmiscutil.a 
libtool: link: g++ -Werror -Wall -Wpointer-arith -Wwrite-strings -Wcomments -g 
-O2 -g -o testIcmp testIcmp.o testMain.o time.o test_tools.o globals.o  
/usr/lib/libcppunit.so -ldl ./.libs/libicmp-core.a ../ip/.libs/libip.a 
../../lib/libmiscutil.a
make[5]: Leaving directory 
`<http://build.squid-cache.org/job/3.HEAD-i386-Debian-sid/ws/btlayer-00-default/squid-3.HEAD-BZR/_build/src/icmp'>
make  check-TESTS
make[5]: Entering directory 
`<http://build.squid-cache.org/job/3.HEAD-i386-Debian-sid/ws/btlayer-00-default/squid-3.HEAD-BZR/_build/src/icmp'>
/bin/sh ../../../test-suite/testheaders.sh "g++ -DHAVE_CONFIG_H 
-DDEFAULT_CONFIG_FILE=NULL  -I../../.. -I../../../include -I../../../src 
-I../../include   -I/usr/include/libxml2  -Werror -Wall -Wpointer-arith 
-Wwrite-strings -Wcomments  -g -O2" "../../../src/icmp" || exit 1
Testing ../../../src/icmp/Icmp4.h ...OK.
Testing ../../../src/icmp/Icmp6.h ...OK.
Testing ../../../src/icmp/IcmpConfig.h ...OK.
Testing ../../../src/icmp/Icmp.h ...OK.
Testing ../../../src/icmp/IcmpPinger.h ...OK.
Testing ../../../src/icmp/IcmpSquid.h ...OK.
Testing ../../../src/icmp/net_db.h ...OK.
Testing ../../../src/icmp/testIcmp.h ...OK.
PASS: testHeaders

OK (0)
PASS: testIcmp
==================
All 2 tests passed
==================
make[5]: Leaving directory 
`<http://build.squid-cache.org/job/3.HEAD-i386-Debian-sid/ws/btlayer-00-default/squid-3.HEAD-BZR/_build/src/icmp'>
make[4]: Leaving directory 
`<http://build.squid-cache.org/job/3.HEAD-i386-Debian-sid/ws/btlayer-00-default/squid-3.HEAD-BZR/_build/src/icmp'>
Making check in ident
make[4]: Entering directory 
`<http://build.squid-cache.org/job/3.HEAD-i386-Debian-sid/ws/btlayer-00-default/squid-3.HEAD-BZR/_build/src/ident'>
make  
make[5]: Entering directory 
`<http://build.squid-cache.org/job/3.HEAD-i386-Debian-sid/ws/btlayer-00-default/squid-3.HEAD-BZR/_build/src/ident'>
make[5]: Nothing to be done for `all'.
make[5]: Leaving directory 
`<http://build.squid-cache.org/job/3.HEAD-i386-Debian-sid/ws/btlayer-00-default/squid-3.HEAD-BZR/_build/src/ident'>
make  check-TESTS
make[5]: Entering directory 
`<http://build.squid-cache.org/job/3.HEAD-i386-Debian-sid/ws/btlayer-00-default/squid-3.HEAD-BZR/_build/src/ident'>
/bin/sh ../../../test-suite/testheaders.sh "g++ -DHAVE_CONFIG_H  -I../../.. 
-I../../../include -I../../../src -I../../include   -I/usr/include/libxml2  
-Werror -Wall -Wpointer-arith -Wwrite-strings -Wcomments  -g -O2" 
"../../../src/ident" || exit 1
Testing ../../../src/ident/AclIdent.h ...OK.
Testing ../../../src/ident/Config.h ...OK.
Testing ../../../src/ident/Ident.h ...OK.
PASS: testHeaders
=============
1 test passed
=============
make[5]: Leaving directory 
`<http://build.squid-cache.org/job/3.HEAD-i386-Debian-sid/ws/btlayer-00-default/squid-3.HEAD-BZR/_build/src/ident'>
make[4]: Leaving directory 
`<http://build.squid-cache.org/job/3.HEAD-i386-Debian-sid/ws/btlayer-00-default/squid-3.HEAD-BZR/_build/src/ident'>
make[4]: Entering directory 
`<http://build.squid-cache.org/job/3.HEAD-i386-Debian-sid/ws/btlayer-00-default/squid-3.HEAD-BZR/_build/src'>
make  tests/testAuth tests/testACLMaxUserIP tests/testBoilerplate 
tests/testCacheManager tests/testDiskIO tests/testEvent tests/testEventLoop 
tests/test_http_range tests/testHttpReply tests/testHttpRequest tests/testStore 
tests/testString tests/testURL  tests/testUfs
make[5]: Entering directory 
`<http://build.squid-cache.org/job/3.HEAD-i386-Debian-sid/ws/btlayer-00-default/squid-3.HEAD-BZR/_build/src'>
depbase=`echo tests/testAuth.o | sed 's|[^/]*$|.deps/&|;s|\.o$||'`;\
        g++ -DHAVE_CONFIG_H 
-DDEFAULT_CONFIG_FILE=\"<http://build.squid-cache.org/job/3.HEAD-i386-Debian-sid/ws/btlayer-00-default/squid-3.HEAD-BZR/_inst/etc/squid.conf\";>
 
-DDEFAULT_SQUID_DATA_DIR=\"<http://build.squid-cache.org/job/3.HEAD-i386-Debian-sid/ws/btlayer-00-default/squid-3.HEAD-BZR/_inst/share\";>
 
-DDEFAULT_SQUID_CONFIG_DIR=\"<http://build.squid-cache.org/job/3.HEAD-i386-Debian-sid/ws/btlayer-00-default/squid-3.HEAD-BZR/_inst/etc\";>
  -I../.. -I../../include -I../../src -I../include -I../../lib -I../src  
-I/usr/include/libxml2  -Werror -Wall -Wpointer-arith -Wwrite-strings 
-Wcomments  -g -O2 -MT tests/testAuth.o -MD -MP -MF $depbase.Tpo -c -o 
tests/testAuth.o ../../src/tests/testAuth.cc &&\
        mv -f $depbase.Tpo $depbase.Po
depbase=`echo tests/testMain.o | sed 's|[^/]*$|.deps/&|;s|\.o$||'`;\
        g++ -DHAVE_CONFIG_H 
-DDEFAULT_CONFIG_FILE=\"<http://build.squid-cache.org/job/3.HEAD-i386-Debian-sid/ws/btlayer-00-default/squid-3.HEAD-BZR/_inst/etc/squid.conf\";>
 
-DDEFAULT_SQUID_DATA_DIR=\"<http://build.squid-cache.org/job/3.HEAD-i386-Debian-sid/ws/btlayer-00-default/squid-3.HEAD-BZR/_inst/share\";>
 
-DDEFAULT_SQUID_CONFIG_DIR=\"<http://build.squid-cache.org/job/3.HEAD-i386-Debian-sid/ws/btlayer-00-default/squid-3.HEAD-BZR/_inst/etc\";>
  -I../.. -I../../include -I../../src -I../include -I../../lib -I../src  
-I/usr/include/libxml2  -Werror -Wall -Wpointer-arith -Wwrite-strings 
-Wcomments  -g -O2 -MT tests/testMain.o -MD -MP -MF $depbase.Tpo -c -o 
tests/testMain.o ../../src/tests/testMain.cc &&\
        mv -f $depbase.Tpo $depbase.Po
depbase=`echo tests/stub_acl.o | sed 's|[^/]*$|.deps/&|;s|\.o$||'`;\
        g++ -DHAVE_CONFIG_H 
-DDEFAULT_CONFIG_FILE=\"<http://build.squid-cache.org/job/3.HEAD-i386-Debian-sid/ws/btlayer-00-default/squid-3.HEAD-BZR/_inst/etc/squid.conf\";>
 
-DDEFAULT_SQUID_DATA_DIR=\"<http://build.squid-cache.org/job/3.HEAD-i386-Debian-sid/ws/btlayer-00-default/squid-3.HEAD-BZR/_inst/share\";>
 
-DDEFAULT_SQUID_CONFIG_DIR=\"<http://build.squid-cache.org/job/3.HEAD-i386-Debian-sid/ws/btlayer-00-default/squid-3.HEAD-BZR/_inst/etc\";>
  -I../.. -I../../include -I../../src -I../include -I../../lib -I../src  
-I/usr/include/libxml2  -Werror -Wall -Wpointer-arith -Wwrite-strings 
-Wcomments  -g -O2 -MT tests/stub_acl.o -MD -MP -MF $depbase.Tpo -c -o 
tests/stub_acl.o ../../src/tests/stub_acl.cc &&\
        mv -f $depbase.Tpo $depbase.Po
depbase=`echo tests/stub_cache_cf.o | sed 's|[^/]*$|.deps/&|;s|\.o$||'`;\
        g++ -DHAVE_CONFIG_H 
-DDEFAULT_CONFIG_FILE=\"<http://build.squid-cache.org/job/3.HEAD-i386-Debian-sid/ws/btlayer-00-default/squid-3.HEAD-BZR/_inst/etc/squid.conf\";>
 
-DDEFAULT_SQUID_DATA_DIR=\"<http://build.squid-cache.org/job/3.HEAD-i386-Debian-sid/ws/btlayer-00-default/squid-3.HEAD-BZR/_inst/share\";>
 
-DDEFAULT_SQUID_CONFIG_DIR=\"<http://build.squid-cache.org/job/3.HEAD-i386-Debian-sid/ws/btlayer-00-default/squid-3.HEAD-BZR/_inst/etc\";>
  -I../.. -I../../include -I../../src -I../include -I../../lib -I../src  
-I/usr/include/libxml2  -Werror -Wall -Wpointer-arith -Wwrite-strings 
-Wcomments  -g -O2 -MT tests/stub_cache_cf.o -MD -MP -MF $depbase.Tpo -c -o 
tests/stub_cache_cf.o ../../src/tests/stub_cache_cf.cc &&\
        mv -f $depbase.Tpo $depbase.Po
depbase=`echo tests/stub_helper.o | sed 's|[^/]*$|.deps/&|;s|\.o$||'`;\
        g++ -DHAVE_CONFIG_H 
-DDEFAULT_CONFIG_FILE=\"<http://build.squid-cache.org/job/3.HEAD-i386-Debian-sid/ws/btlayer-00-default/squid-3.HEAD-BZR/_inst/etc/squid.conf\";>
 
-DDEFAULT_SQUID_DATA_DIR=\"<http://build.squid-cache.org/job/3.HEAD-i386-Debian-sid/ws/btlayer-00-default/squid-3.HEAD-BZR/_inst/share\";>
 
-DDEFAULT_SQUID_CONFIG_DIR=\"<http://build.squid-cache.org/job/3.HEAD-i386-Debian-sid/ws/btlayer-00-default/squid-3.HEAD-BZR/_inst/etc\";>
  -I../.. -I../../include -I../../src -I../include -I../../lib -I../src  
-I/usr/include/libxml2  -Werror -Wall -Wpointer-arith -Wwrite-strings 
-Wcomments  -g -O2 -MT tests/stub_helper.o -MD -MP -MF $depbase.Tpo -c -o 
tests/stub_helper.o ../../src/tests/stub_helper.cc &&\
        mv -f $depbase.Tpo $depbase.Po
depbase=`echo tests/stub_store.o | sed 's|[^/]*$|.deps/&|;s|\.o$||'`;\
        g++ -DHAVE_CONFIG_H 
-DDEFAULT_CONFIG_FILE=\"<http://build.squid-cache.org/job/3.HEAD-i386-Debian-sid/ws/btlayer-00-default/squid-3.HEAD-BZR/_inst/etc/squid.conf\";>
 
-DDEFAULT_SQUID_DATA_DIR=\"<http://build.squid-cache.org/job/3.HEAD-i386-Debian-sid/ws/btlayer-00-default/squid-3.HEAD-BZR/_inst/share\";>
 
-DDEFAULT_SQUID_CONFIG_DIR=\"<http://build.squid-cache.org/job/3.HEAD-i386-Debian-sid/ws/btlayer-00-default/squid-3.HEAD-BZR/_inst/etc\";>
  -I../.. -I../../include -I../../src -I../include -I../../lib -I../src  
-I/usr/include/libxml2  -Werror -Wall -Wpointer-arith -Wwrite-strings 
-Wcomments  -g -O2 -MT tests/stub_store.o -MD -MP -MF $depbase.Tpo -c -o 
tests/stub_store.o ../../src/tests/stub_store.cc &&\
        mv -f $depbase.Tpo $depbase.Po
depbase=`echo tests/stub_errorpage.o | sed 's|[^/]*$|.deps/&|;s|\.o$||'`;\
        g++ -DHAVE_CONFIG_H 
-DDEFAULT_CONFIG_FILE=\"<http://build.squid-cache.org/job/3.HEAD-i386-Debian-sid/ws/btlayer-00-default/squid-3.HEAD-BZR/_inst/etc/squid.conf\";>
 
-DDEFAULT_SQUID_DATA_DIR=\"<http://build.squid-cache.org/job/3.HEAD-i386-Debian-sid/ws/btlayer-00-default/squid-3.HEAD-BZR/_inst/share\";>
 
-DDEFAULT_SQUID_CONFIG_DIR=\"<http://build.squid-cache.org/job/3.HEAD-i386-Debian-sid/ws/btlayer-00-default/squid-3.HEAD-BZR/_inst/etc\";>
  -I../.. -I../../include -I../../src -I../include -I../../lib -I../src  
-I/usr/include/libxml2  -Werror -Wall -Wpointer-arith -Wwrite-strings 
-Wcomments  -g -O2 -MT tests/stub_errorpage.o -MD -MP -MF $depbase.Tpo -c -o 
tests/stub_errorpage.o ../../src/tests/stub_errorpage.cc &&\
        mv -f $depbase.Tpo $depbase.Po
depbase=`echo tests/stub_HttpRequest.o | sed 's|[^/]*$|.deps/&|;s|\.o$||'`;\
        g++ -DHAVE_CONFIG_H 
-DDEFAULT_CONFIG_FILE=\"<http://build.squid-cache.org/job/3.HEAD-i386-Debian-sid/ws/btlayer-00-default/squid-3.HEAD-BZR/_inst/etc/squid.conf\";>
 
-DDEFAULT_SQUID_DATA_DIR=\"<http://build.squid-cache.org/job/3.HEAD-i386-Debian-sid/ws/btlayer-00-default/squid-3.HEAD-BZR/_inst/share\";>
 
-DDEFAULT_SQUID_CONFIG_DIR=\"<http://build.squid-cache.org/job/3.HEAD-i386-Debian-sid/ws/btlayer-00-default/squid-3.HEAD-BZR/_inst/etc\";>
  -I../.. -I../../include -I../../src -I../include -I../../lib -I../src  
-I/usr/include/libxml2  -Werror -Wall -Wpointer-arith -Wwrite-strings 
-Wcomments  -g -O2 -MT tests/stub_HttpRequest.o -MD -MP -MF $depbase.Tpo -c -o 
tests/stub_HttpRequest.o ../../src/tests/stub_HttpRequest.cc &&\
        mv -f $depbase.Tpo $depbase.Po
depbase=`echo tests/stub_DelayId.o | sed 's|[^/]*$|.deps/&|;s|\.o$||'`;\
        g++ -DHAVE_CONFIG_H 
-DDEFAULT_CONFIG_FILE=\"<http://build.squid-cache.org/job/3.HEAD-i386-Debian-sid/ws/btlayer-00-default/squid-3.HEAD-BZR/_inst/etc/squid.conf\";>
 
-DDEFAULT_SQUID_DATA_DIR=\"<http://build.squid-cache.org/job/3.HEAD-i386-Debian-sid/ws/btlayer-00-default/squid-3.HEAD-BZR/_inst/share\";>
 
-DDEFAULT_SQUID_CONFIG_DIR=\"<http://build.squid-cache.org/job/3.HEAD-i386-Debian-sid/ws/btlayer-00-default/squid-3.HEAD-BZR/_inst/etc\";>
  -I../.. -I../../include -I../../src -I../include -I../../lib -I../src  
-I/usr/include/libxml2  -Werror -Wall -Wpointer-arith -Wwrite-strings 
-Wcomments  -g -O2 -MT tests/stub_DelayId.o -MD -MP -MF $depbase.Tpo -c -o 
tests/stub_DelayId.o ../../src/tests/stub_DelayId.cc &&\
        mv -f $depbase.Tpo $depbase.Po
depbase=`echo tests/stub_MemObject.o | sed 's|[^/]*$|.deps/&|;s|\.o$||'`;\
        g++ -DHAVE_CONFIG_H 
-DDEFAULT_CONFIG_FILE=\"<http://build.squid-cache.org/job/3.HEAD-i386-Debian-sid/ws/btlayer-00-default/squid-3.HEAD-BZR/_inst/etc/squid.conf\";>
 
-DDEFAULT_SQUID_DATA_DIR=\"<http://build.squid-cache.org/job/3.HEAD-i386-Debian-sid/ws/btlayer-00-default/squid-3.HEAD-BZR/_inst/share\";>
 
-DDEFAULT_SQUID_CONFIG_DIR=\"<http://build.squid-cache.org/job/3.HEAD-i386-Debian-sid/ws/btlayer-00-default/squid-3.HEAD-BZR/_inst/etc\";>
  -I../.. -I../../include -I../../src -I../include -I../../lib -I../src  
-I/usr/include/libxml2  -Werror -Wall -Wpointer-arith -Wwrite-strings 
-Wcomments  -g -O2 -MT tests/stub_MemObject.o -MD -MP -MF $depbase.Tpo -c -o 
tests/stub_MemObject.o ../../src/tests/stub_MemObject.cc &&\
        mv -f $depbase.Tpo $depbase.Po
../../src/tests/stub_MemObject.cc:63: error: prototype for 'int64_t 
MemObject::policyLowestOffsetToKeep() const' does not match any in class 
'MemObject'
../../src/MemObject.h:76: error: candidate is: int64_t 
MemObject::policyLowestOffsetToKeep(bool) const
make[5]: *** [tests/stub_MemObject.o] Error 1
make[5]: Leaving directory 
`<http://build.squid-cache.org/job/3.HEAD-i386-Debian-sid/ws/btlayer-00-default/squid-3.HEAD-BZR/_build/src'>
make[4]: *** [check-am] Error 2
make[4]: Leaving directory 
`<http://build.squid-cache.org/job/3.HEAD-i386-Debian-sid/ws/btlayer-00-default/squid-3.HEAD-BZR/_build/src'>
make[3]: *** [check-recursive] Error 1
make[3]: Leaving directory 
`<http://build.squid-cache.org/job/3.HEAD-i386-Debian-sid/ws/btlayer-00-default/squid-3.HEAD-BZR/_build/src'>
make[2]: *** [check] Error 2
make[2]: Leaving directory 
`<http://build.squid-cache.org/job/3.HEAD-i386-Debian-sid/ws/btlayer-00-default/squid-3.HEAD-BZR/_build/src'>
make[1]: *** [check-recursive] Error 1
make[1]: Leaving directory 
`<http://build.squid-cache.org/job/3.HEAD-i386-Debian-sid/ws/btlayer-00-default/squid-3.HEAD-BZR/_build'>
make: *** [distcheck] Error 2
buildtest.sh result is 2
BUILD: .././test-suite/buildtests/layer-00-default.opts
../../src/tests/stub_MemObject.cc:63: error: prototype for 'int64_t 
MemObject::policyLowestOffsetToKeep() const' does not match any in class 
'MemObject'
../../src/MemObject.h:76: error: candidate is: int64_t 
MemObject::policyLowestOffsetToKeep(bool) const
make[5]: *** [tests/stub_MemObject.o] Error 1
make[4]: *** [check-am] Error 2
make[3]: *** [check-recursive] Error 1
make[2]: *** [check] Error 2
make[1]: *** [check-recursive] Error 1
make: *** [distcheck] Error 2
Build Failed. Last log lines are:
depbase=`echo tests/stub_DelayId.o | sed 's|[^/]*$|.deps/&|;s|\.o$||'`;\
        g++ -DHAVE_CONFIG_H 
-DDEFAULT_CONFIG_FILE=\"<http://build.squid-cache.org/job/3.HEAD-i386-Debian-sid/ws/btlayer-00-default/squid-3.HEAD-BZR/_inst/etc/squid.conf\";>
 
-DDEFAULT_SQUID_DATA_DIR=\"<http://build.squid-cache.org/job/3.HEAD-i386-Debian-sid/ws/btlayer-00-default/squid-3.HEAD-BZR/_inst/share\";>
 
-DDEFAULT_SQUID_CONFIG_DIR=\"<http://build.squid-cache.org/job/3.HEAD-i386-Debian-sid/ws/btlayer-00-default/squid-3.HEAD-BZR/_inst/etc\";>
  -I../.. -I../../include -I../../src -I../include -I../../lib -I../src  
-I/usr/include/libxml2  -Werror -Wall -Wpointer-arith -Wwrite-strings 
-Wcomments  -g -O2 -MT tests/stub_DelayId.o -MD -MP -MF $depbase.Tpo -c -o 
tests/stub_DelayId.o ../../src/tests/stub_DelayId.cc &&\
        mv -f $depbase.Tpo $depbase.Po
depbase=`echo tests/stub_MemObject.o | sed 's|[^/]*$|.deps/&|;s|\.o$||'`;\
        g++ -DHAVE_CONFIG_H 
-DDEFAULT_CONFIG_FILE=\"<http://build.squid-cache.org/job/3.HEAD-i386-Debian-sid/ws/btlayer-00-default/squid-3.HEAD-BZR/_inst/etc/squid.conf\";>
 
-DDEFAULT_SQUID_DATA_DIR=\"<http://build.squid-cache.org/job/3.HEAD-i386-Debian-sid/ws/btlayer-00-default/squid-3.HEAD-BZR/_inst/share\";>
 
-DDEFAULT_SQUID_CONFIG_DIR=\"<http://build.squid-cache.org/job/3.HEAD-i386-Debian-sid/ws/btlayer-00-default/squid-3.HEAD-BZR/_inst/etc\";>
  -I../.. -I../../include -I../../src -I../include -I../../lib -I../src  
-I/usr/include/libxml2  -Werror -Wall -Wpointer-arith -Wwrite-strings 
-Wcomments  -g -O2 -MT tests/stub_MemObject.o -MD -MP -MF $depbase.Tpo -c -o 
tests/stub_MemObject.o ../../src/tests/stub_MemObject.cc &&\
        mv -f $depbase.Tpo $depbase.Po
../../src/tests/stub_MemObject.cc:63: error: prototype for 'int64_t 
MemObject::policyLowestOffsetToKeep() const' does not match any in class 
'MemObject'
../../src/MemObject.h:76: error: candidate is: int64_t 
MemObject::policyLowestOffsetToKeep(bool) const
make[5]: *** [tests/stub_MemObject.o] Error 1
make[5]: Leaving directory 
`<http://build.squid-cache.org/job/3.HEAD-i386-Debian-sid/ws/btlayer-00-default/squid-3.HEAD-BZR/_build/src'>
make[4]: *** [check-am] Error 2
make[4]: Leaving directory 
`<http://build.squid-cache.org/job/3.HEAD-i386-Debian-sid/ws/btlayer-00-default/squid-3.HEAD-BZR/_build/src'>
make[3]: *** [check-recursive] Error 1
make[3]: Leaving directory 
`<http://build.squid-cache.org/job/3.HEAD-i386-Debian-sid/ws/btlayer-00-default/squid-3.HEAD-BZR/_build/src'>
make[2]: *** [check] Error 2
make[2]: Leaving directory 
`<http://build.squid-cache.org/job/3.HEAD-i386-Debian-sid/ws/btlayer-00-default/squid-3.HEAD-BZR/_build/src'>
make[1]: *** [check-recursive] Error 1
make[1]: Leaving directory 
`<http://build.squid-cache.org/job/3.HEAD-i386-Debian-sid/ws/btlayer-00-default/squid-3.HEAD-BZR/_build'>
make: *** [distcheck] Error 2
buildtest.sh result is 2

Reply via email to