------------------------------------------------------------
revno: 13994
revision-id: squid3@treenet.co.nz-20160223155204-zamb5a1ju62u8z43
parent: squid3@treenet.co.nz-20160223154710-wcrkwwyohp2f263g
author: Francesco Chemolli <kinkie@squid-cache.org>
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: 3.5
timestamp: Wed 2016-02-24 04:52:04 +1300
message:
  MacOS: shorten testRock store path to fit in shm segment filename size limitations;
  
  ... also change some tools.cc stubs into nops
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20160223155204-zamb5a1ju62u8z43
# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
# testament_sha1: 9153fc9d07e0cd3e103d72b1e72f49d43f4fa491
# timestamp: 2016-02-23 15:53:38 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
# base_revision_id: squid3@treenet.co.nz-20160223154710-\
#   wcrkwwyohp2f263g
# 
# Begin patch
=== modified file 'src/tests/stub_tools.cc'
--- src/tests/stub_tools.cc	2016-01-01 00:14:27 +0000
+++ src/tests/stub_tools.cc	2016-02-23 15:52:04 +0000
@@ -15,7 +15,7 @@
 
 int DebugSignal = -1;
 SBuf service_name(APP_SHORTNAME);
-void releaseServerSockets(void) STUB
+void releaseServerSockets(void) STUB_NOP
 char * dead_msg(void) STUB_RETVAL(NULL)
 void mail_warranty(void) STUB
 void dumpMallocStats(void) STUB
@@ -32,7 +32,7 @@
 void sig_shutdown(int sig) STUB
 const char * getMyHostname(void) STUB_RETVAL(NULL)
 const char * uniqueHostname(void) STUB_RETVAL(NULL)
-void leave_suid(void) STUB
+void leave_suid(void) STUB_NOP
 void enter_suid(void) STUB
 void no_suid(void) STUB
 

=== modified file 'src/tests/testRock.cc'
--- src/tests/testRock.cc	2016-01-01 00:14:27 +0000
+++ src/tests/testRock.cc	2016-02-23 15:52:04 +0000
@@ -33,7 +33,7 @@
 #include <unistd.h>
 #endif
 
-#define TESTDIR "testRock_Store"
+#define TESTDIR "tr"
 
 CPPUNIT_TEST_SUITE_REGISTRATION( testRock );