diff --git a/RTCP/Cobalt/InputProc/test/tBlockReader.cc b/RTCP/Cobalt/InputProc/test/tBlockReader.cc index eff3e46a2c43b9075c7211ae0a3361578821b8e2..97dd751b0c2bc0f98ec76e570a84294d8ad1e2cf 100644 --- a/RTCP/Cobalt/InputProc/test/tBlockReader.cc +++ b/RTCP/Cobalt/InputProc/test/tBlockReader.cc @@ -149,7 +149,7 @@ int main() alarm(10); // Use a fixed key, so the test suite knows what to clean - settings.dataKey = 0x12345678; + settings.dataKey = 0x10000001; // Limit the array in size to work on systems with only 32MB SHM settings.nrBoards = 1; diff --git a/RTCP/Cobalt/InputProc/test/tBlockReader.sh b/RTCP/Cobalt/InputProc/test/tBlockReader.sh index e47a565785defe9d268ec23613056df130ae5b75..2e4baaa60958f5a00dc3b39a76332e43c7c285eb 100755 --- a/RTCP/Cobalt/InputProc/test/tBlockReader.sh +++ b/RTCP/Cobalt/InputProc/test/tBlockReader.sh @@ -1,6 +1,6 @@ #!/bin/sh # Remove the shared memory region if the test crashes -trap "ipcrm -M 0x12345678 2>/dev/null || true" EXIT +trap "ipcrm -M 0x10000001 2>/dev/null || true" EXIT ./runctest.sh tBlockReader > tBlockReader.log 2>&1 diff --git a/RTCP/Cobalt/InputProc/test/tPacketWriter.cc b/RTCP/Cobalt/InputProc/test/tPacketWriter.cc index 6a0962cce2d44b3ccf16c5c136e8d6d439937d7c..9f19a71cfbc1871244256495701419c84084c19e 100644 --- a/RTCP/Cobalt/InputProc/test/tPacketWriter.cc +++ b/RTCP/Cobalt/InputProc/test/tPacketWriter.cc @@ -111,7 +111,7 @@ int main() struct BufferSettings settings(stationID, false); // Use a fixed key, so the test suite knows what to clean - settings.dataKey = 0x12345678; + settings.dataKey = 0x10000003; // Limit the array in size to work on systems with only 32MB SHM settings.nrBoards = 1; diff --git a/RTCP/Cobalt/InputProc/test/tPacketWriter.sh b/RTCP/Cobalt/InputProc/test/tPacketWriter.sh index 71293cb8041852725410b077eac32bf28eb6c703..8bdc6b3e7a71d8adf0e43e95bb9941429e9f5746 100755 --- a/RTCP/Cobalt/InputProc/test/tPacketWriter.sh +++ b/RTCP/Cobalt/InputProc/test/tPacketWriter.sh @@ -1,6 +1,6 @@ #!/bin/sh # Remove the shared memory region if the test crashes -trap "ipcrm -M 0x12345678 2>/dev/null || true" EXIT +trap "ipcrm -M 0x10000003 2>/dev/null || true" EXIT ./runctest.sh tPacketWriter > tPacketWriter.log 2>&1 diff --git a/RTCP/Cobalt/InputProc/test/tPacketsToBuffer.cc b/RTCP/Cobalt/InputProc/test/tPacketsToBuffer.cc index 5254687cc48ae2fc64f8fa1c7a6aa44077f802cd..2fcaba5f0957b0d49ff13ab7a221278c8e9c8bfb 100644 --- a/RTCP/Cobalt/InputProc/test/tPacketsToBuffer.cc +++ b/RTCP/Cobalt/InputProc/test/tPacketsToBuffer.cc @@ -72,7 +72,7 @@ int main() struct BufferSettings settings(stationID, false); // Use a fixed key, so the test suite knows what to clean - settings.dataKey = 0x12345678; + settings.dataKey = 0x10000002; // Limit the array in size to work on systems with only 32MB SHM settings.nrBoards = 1; diff --git a/RTCP/Cobalt/InputProc/test/tPacketsToBuffer.sh b/RTCP/Cobalt/InputProc/test/tPacketsToBuffer.sh index cba872813e197ea6f6bb5078344700b1eb6439d3..e0a35674e20cc1d7fa1bef0273859fbace32608d 100755 --- a/RTCP/Cobalt/InputProc/test/tPacketsToBuffer.sh +++ b/RTCP/Cobalt/InputProc/test/tPacketsToBuffer.sh @@ -1,6 +1,6 @@ #!/bin/sh # Remove the shared memory region if the test crashes -trap "ipcrm -M 0x12345678 2>/dev/null || true" EXIT +trap "ipcrm -M 0x10000002 2>/dev/null || true" EXIT ./runctest.sh tPacketsToBuffer > tPacketsToBuffer.log 2>&1 diff --git a/RTCP/Cobalt/InputProc/test/tSampleBuffer.cc b/RTCP/Cobalt/InputProc/test/tSampleBuffer.cc index 753d5781fb04011b69f4a5233193672599a5ef7e..ea13871439108e4bde21b3d17b16302624d328c3 100644 --- a/RTCP/Cobalt/InputProc/test/tSampleBuffer.cc +++ b/RTCP/Cobalt/InputProc/test/tSampleBuffer.cc @@ -56,7 +56,7 @@ int main() struct BufferSettings settings(stationID, false); // Use a fixed key, so the test suite knows what to clean - settings.dataKey = 0x12345678; + settings.dataKey = 0x10000004; // Limit the array in size to work on systems with only 32MB SHM settings.nrBoards = 1; diff --git a/RTCP/Cobalt/InputProc/test/tSampleBuffer.sh b/RTCP/Cobalt/InputProc/test/tSampleBuffer.sh index 252b72cec1a3ec7592aff601b57143e9f1dbcf3a..9e174f0e5eb3a68376618edc75e747e1165221d5 100755 --- a/RTCP/Cobalt/InputProc/test/tSampleBuffer.sh +++ b/RTCP/Cobalt/InputProc/test/tSampleBuffer.sh @@ -1,6 +1,6 @@ #!/bin/sh # Remove the shared memory region if the test crashes -trap "ipcrm -M 0x12345678 2>/dev/null || true" EXIT +trap "ipcrm -M 0x10000004 2>/dev/null || true" EXIT ./runctest.sh tSampleBuffer > tSampleBuffer.log 2>&1 diff --git a/RTCP/Cobalt/InputProc/test/tSampleBufferSync.cc b/RTCP/Cobalt/InputProc/test/tSampleBufferSync.cc index a882e485a0330327cd838e7ff350f48aa999e18c..83941b20371c8fb860affdb5ff85093014418f8d 100644 --- a/RTCP/Cobalt/InputProc/test/tSampleBufferSync.cc +++ b/RTCP/Cobalt/InputProc/test/tSampleBufferSync.cc @@ -52,7 +52,7 @@ void initBoard() struct BufferSettings settings(stationID, false); // Use a fixed key, so the test suite knows what to clean - settings.dataKey = 0x12345678; + settings.dataKey = 0x10000005; // Limit the array in size to work on systems with only 32MB SHM settings.nrBoards = 1; diff --git a/RTCP/Cobalt/InputProc/test/tSampleBufferSync.sh b/RTCP/Cobalt/InputProc/test/tSampleBufferSync.sh index 51db7688fdce8c61375ab8ae2a0adf3e025e0c31..e98fb7b06c05399ed0bc537d8018a256bb59bba5 100755 --- a/RTCP/Cobalt/InputProc/test/tSampleBufferSync.sh +++ b/RTCP/Cobalt/InputProc/test/tSampleBufferSync.sh @@ -1,6 +1,6 @@ #!/bin/sh # Remove the shared memory region if the test crashes -trap "ipcrm -M 0x12345678 2>/dev/null || true" EXIT +trap "ipcrm -M 0x10000005 2>/dev/null || true" EXIT ./runctest.sh tSampleBufferSync > tSampleBufferSync.log 2>&1 diff --git a/RTCP/Cobalt/InputProc/test/tSharedMemory.cc b/RTCP/Cobalt/InputProc/test/tSharedMemory.cc index a20e73376ca5fccfd3414aa3ad95c035fd758536..98da9f444a2c4760ead62d7fbd71a03c93588c65 100644 --- a/RTCP/Cobalt/InputProc/test/tSharedMemory.cc +++ b/RTCP/Cobalt/InputProc/test/tSharedMemory.cc @@ -28,6 +28,8 @@ #include <InputProc/Buffer/SharedMemory.h> +#define DATAKEY 0x10000006 + using namespace LOFAR; using namespace Cobalt; @@ -40,7 +42,7 @@ public: { sleep(1); - SharedMemoryArena m( 0x12345678, 1024, SharedMemoryArena::CREATE, 0 ); + SharedMemoryArena m( DATAKEY, 1024, SharedMemoryArena::CREATE, 0 ); LOG_INFO("Memory area created"); @@ -52,7 +54,7 @@ public: { LOG_INFO("Waiting for memory area"); - SharedMemoryArena m( 0x12345678, 1024, SharedMemoryArena::READ, 2 ); + SharedMemoryArena m( DATAKEY, 1024, SharedMemoryArena::READ, 2 ); LOG_INFO("Memory area attached"); @@ -69,16 +71,16 @@ int main() { LOG_INFO("Create shared memory region"); - SharedMemoryArena m( 0x12345678, 1024, SharedMemoryArena::CREATE, 0 ); + SharedMemoryArena m( DATAKEY, 1024, SharedMemoryArena::CREATE, 0 ); } /* Create a shared memory region and access it */ { LOG_INFO("Create shared memory region and access it"); - SharedMemoryArena x( 0x12345678, 1024, SharedMemoryArena::CREATE, 0 ); + SharedMemoryArena x( DATAKEY, 1024, SharedMemoryArena::CREATE, 0 ); - SharedMemoryArena y( 0x12345678, 1024, SharedMemoryArena::READ, 0 ); + SharedMemoryArena y( DATAKEY, 1024, SharedMemoryArena::READ, 0 ); } /* Access a non-existing shared memory region */ @@ -88,7 +90,7 @@ int main() bool caught_exception = false; try { - SharedMemoryArena y( 0x12345678, 1024, SharedMemoryArena::READ, 0 ); + SharedMemoryArena y( DATAKEY, 1024, SharedMemoryArena::READ, 0 ); } catch(SystemCallException &e) { caught_exception = true; } @@ -103,7 +105,7 @@ int main() bool caught_exception = false; try { - SharedMemoryArena y( 0x12345678, 1024, SharedMemoryArena::READ, 1 ); + SharedMemoryArena y( DATAKEY, 1024, SharedMemoryArena::READ, 1 ); } catch(SharedMemoryArena::TimeOutException &e) { caught_exception = true; } @@ -130,9 +132,9 @@ int main() { LOG_INFO("Checking memory access through SharedStruct"); - SharedStruct<int> writer( 0x12345678, true, 0 ); + SharedStruct<int> writer( DATAKEY, true, 0 ); - SharedStruct<int> reader( 0x12345678, false, 0 ); + SharedStruct<int> reader( DATAKEY, false, 0 ); writer.get() = 42; ASSERT( reader.get() == 42 ); diff --git a/RTCP/Cobalt/InputProc/test/tSharedMemory.sh b/RTCP/Cobalt/InputProc/test/tSharedMemory.sh index 3340e3d88435d0f0d1c0f27e207d414ce18e2c31..759873854b770e12e41b9713e6dc79931f4eb385 100755 --- a/RTCP/Cobalt/InputProc/test/tSharedMemory.sh +++ b/RTCP/Cobalt/InputProc/test/tSharedMemory.sh @@ -1,6 +1,6 @@ #!/bin/sh # Remove the shared memory region if the test crashes -trap "ipcrm -M 0x12345678 2>/dev/null || true" EXIT +trap "ipcrm -M 0x10000006 2>/dev/null || true" EXIT ./runctest.sh tSharedMemory > tSharedMemory.log 2>&1