From: Francesco Chemolli Date: Tue, 23 Feb 2016 15:52:04 +0000 (+1300) Subject: MacOS: shorten testRock store path to fit in shm segment filename size limitations; X-Git-Tag: SQUID_3_5_15~2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cc3ae34405e007c2bcda5c0e2df5987b7dbcdefc;p=thirdparty%2Fsquid.git MacOS: shorten testRock store path to fit in shm segment filename size limitations; ... also change some tools.cc stubs into nops --- diff --git a/src/tests/stub_tools.cc b/src/tests/stub_tools.cc index b079c23593..64baeef912 100644 --- a/src/tests/stub_tools.cc +++ b/src/tests/stub_tools.cc @@ -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_child(int sig) STUB 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 diff --git a/src/tests/testRock.cc b/src/tests/testRock.cc index 3d000b4634..c5f958a43b 100644 --- a/src/tests/testRock.cc +++ b/src/tests/testRock.cc @@ -33,7 +33,7 @@ #include #endif -#define TESTDIR "testRock_Store" +#define TESTDIR "tr" CPPUNIT_TEST_SUITE_REGISTRATION( testRock );