Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions configure/CONFIG_SITE.linux-x86_64.Common
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,16 @@ BUILD_IOCS=NO
# - GraphicsMagick is required for NDFileMagick and the URL driver.
USE_GRAPHICSMAGICK=NO

#CROSS_COMPILER_TARGET_ARCHS =
#CROSS_COMPILER_TARGET_ARCHS =

# Comment-in the following line if building asyn ports stand-alone
# i.e. without an IOC. Note that asyn will also need to have been
# i.e. without an IOC. Note that asyn will also need to have been
# built with this flag
# EPICS_LIBCOM_ONLY=YES

SSH = /usr
SSH_LIB = $(SSH)/lib64
SSH_INCLUDE = -I$(SSH)/include

# Build unit tests (requires BOOST)
# Build unit tests (requires BOOST >= 1.34.0)
WITH_BOOST = YES
12 changes: 6 additions & 6 deletions pmacApp/unitTests/test_IntegerHashtable.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -130,17 +130,17 @@ BOOST_AUTO_TEST_CASE(test_IntHashtableMemory)

// Record the base memory usage
process_mem_usage(vm, res);
BOOST_MESSAGE("VM: " << vm << "; RSS: " << res);
BOOST_TEST_MESSAGE("VM: " << vm << "; RSS: " << res);
process_mem_usage(vm_base, res_base);
BOOST_MESSAGE("VM: " << vm_base << "; RSS: " << res_base);
BOOST_TEST_MESSAGE("VM: " << vm_base << "; RSS: " << res_base);

// Insert a value 10 times
for (int index = 0; index < 10; index++){
t1.insert("KEY1", 1);
}
// Record the base memory usage
process_mem_usage(vm, res);
BOOST_MESSAGE("VM: " << vm << "; RSS: " << res);
BOOST_TEST_MESSAGE("VM: " << vm << "; RSS: " << res);
// Verify memory usage change less than 1%
BOOST_CHECK_CLOSE(vm/vm_base, 1.0, 1.0);
BOOST_CHECK_CLOSE(res/res_base, 1.0, 1.0);
Expand All @@ -152,7 +152,7 @@ BOOST_AUTO_TEST_CASE(test_IntHashtableMemory)

// Check memory usage
process_mem_usage(vm, res);
BOOST_MESSAGE("VM: " << vm << "; RSS: " << res);
BOOST_TEST_MESSAGE("VM: " << vm << "; RSS: " << res);
// Verify memory usage change less than 1%
BOOST_CHECK_CLOSE(vm/vm_base, 1.0, 1.0);
BOOST_CHECK_CLOSE(res/res_base, 1.0, 1.0);
Expand All @@ -164,7 +164,7 @@ BOOST_AUTO_TEST_CASE(test_IntHashtableMemory)

// Check memory usage
process_mem_usage(vm, res);
BOOST_MESSAGE("VM: " << vm << "; RSS: " << res);
BOOST_TEST_MESSAGE("VM: " << vm << "; RSS: " << res);
// Verify memory usage change less than 1%
BOOST_CHECK_CLOSE(vm/vm_base, 1.0, 1.0);
BOOST_CHECK_CLOSE(res/res_base, 1.0, 1.0);
Expand All @@ -176,7 +176,7 @@ BOOST_AUTO_TEST_CASE(test_IntHashtableMemory)

// Check memory usage
process_mem_usage(vm, res);
BOOST_MESSAGE("VM: " << vm << "; RSS: " << res);
BOOST_TEST_MESSAGE("VM: " << vm << "; RSS: " << res);
// Verify memory usage change less than 1%
BOOST_CHECK_CLOSE(vm/vm_base, 1.0, 1.0);
BOOST_CHECK_CLOSE(res/res_base, 1.0, 1.0);
Expand Down
12 changes: 6 additions & 6 deletions pmacApp/unitTests/test_StringHashtable.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -134,17 +134,17 @@ BOOST_AUTO_TEST_CASE(test_HashtableMemory)

// Record the base memory usage
process_mem_usage(vm, res);
BOOST_MESSAGE("VM: " << vm << "; RSS: " << res);
BOOST_TEST_MESSAGE("VM: " << vm << "; RSS: " << res);
process_mem_usage(vm_base, res_base);
BOOST_MESSAGE("VM: " << vm_base << "; RSS: " << res_base);
BOOST_TEST_MESSAGE("VM: " << vm_base << "; RSS: " << res_base);

// Insert a value 10 times
for (int index = 0; index < 10; index++){
t1.insert("KEY1", "VALUE1");
}
// Record the base memory usage
process_mem_usage(vm, res);
BOOST_MESSAGE("VM: " << vm << "; RSS: " << res);
BOOST_TEST_MESSAGE("VM: " << vm << "; RSS: " << res);
// Verify memory usage change less than 1%
BOOST_CHECK_CLOSE(vm/vm_base, 1.0, 1.0);
BOOST_CHECK_CLOSE(res/res_base, 1.0, 1.0);
Expand All @@ -156,7 +156,7 @@ BOOST_AUTO_TEST_CASE(test_HashtableMemory)

// Check memory usage
process_mem_usage(vm, res);
BOOST_MESSAGE("VM: " << vm << "; RSS: " << res);
BOOST_TEST_MESSAGE("VM: " << vm << "; RSS: " << res);
// Verify memory usage change less than 1%
BOOST_CHECK_CLOSE(vm/vm_base, 1.0, 1.0);
BOOST_CHECK_CLOSE(res/res_base, 1.0, 1.0);
Expand All @@ -168,7 +168,7 @@ BOOST_AUTO_TEST_CASE(test_HashtableMemory)

// Check memory usage
process_mem_usage(vm, res);
BOOST_MESSAGE("VM: " << vm << "; RSS: " << res);
BOOST_TEST_MESSAGE("VM: " << vm << "; RSS: " << res);
// Verify memory usage change less than 1%
BOOST_CHECK_CLOSE(vm/vm_base, 1.0, 1.0);
BOOST_CHECK_CLOSE(res/res_base, 1.0, 1.0);
Expand All @@ -180,7 +180,7 @@ BOOST_AUTO_TEST_CASE(test_HashtableMemory)

// Check memory usage
process_mem_usage(vm, res);
BOOST_MESSAGE("VM: " << vm << "; RSS: " << res);
BOOST_TEST_MESSAGE("VM: " << vm << "; RSS: " << res);
// Verify memory usage change less than 1%
BOOST_CHECK_CLOSE(vm/vm_base, 1.0, 1.0);
BOOST_CHECK_CLOSE(res/res_base, 1.0, 1.0);
Expand Down