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 b079c23593b09611c7fa3e669669ac01a1f2a5e1..64baeef91224e8986c05a6b243d2e92d92dc1975 100644 (file)
--- 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 3d000b4634d193d266955fbd6362b4d5f0707c47..c5f958a43b5d95a4823274f8c78c18d6bc6c4403 100644 (file)
--- a/src/tests/testRock.cc
+++ b/src/tests/testRock.cc
@@ -33,7 +33,7 @@
 #include <unistd.h>
 #endif
 
-#define TESTDIR "testRock_Store"
+#define TESTDIR "tr"
 
 CPPUNIT_TEST_SUITE_REGISTRATION( testRock );