External/pugixml
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tests: Fix test compilation

Browse Source 
Rename PAGE_SIZE to page_size to avoid define conflict with Android SDK.
Minor fixes in several tests.
This commit is contained in:
Arseny Kapoulkine 2015-03-21 00:14:53 -07:00
parent 28e63f66e1
commit ce974094ac
3 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
tests/allocator.cpp
View File

@ -23,11 +23,11 @@
namespace namespace
{ {
const size_t PAGE_SIZE = 4096; const size_t page_size = 4096;
size_t align_to_page(size_t value) size_t align_to_page(size_t value)
{ {
return (value + PAGE_SIZE - 1) & ~(PAGE_SIZE - 1); return (value + page_size - 1) & ~(page_size - 1);
} }
void* allocate_page_aligned(size_t size) void* allocate_page_aligned(size_t size)
@ -36,7 +36,7 @@ namespace
// We can't use malloc because of occasional problems with CW on CRT termination // We can't use malloc because of occasional problems with CW on CRT termination
static HANDLE heap = HeapCreate(0, 0, 0); static HANDLE heap = HeapCreate(0, 0, 0);
void* result = HeapAlloc(heap, 0, size + PAGE_SIZE); void* result = HeapAlloc(heap, 0, size + page_size);
return reinterpret_cast<void*>(align_to_page(reinterpret_cast<size_t>(result))); return reinterpret_cast<void*>(align_to_page(reinterpret_cast<size_t>(result)));
} }
@ -45,13 +45,13 @@ namespace
{ {
size_t aligned_size = align_to_page(size); size_t aligned_size = align_to_page(size);
void* ptr = allocate_page_aligned(aligned_size + PAGE_SIZE); void* ptr = allocate_page_aligned(aligned_size + page_size);
if (!ptr) return 0; if (!ptr) return 0;
char* end = static_cast<char*>(ptr) + aligned_size; char* end = static_cast<char*>(ptr) + aligned_size;
DWORD old_flags; DWORD old_flags;
VirtualProtect(end, PAGE_SIZE, PAGE_NOACCESS, &old_flags); VirtualProtect(end, page_size, PAGE_NOACCESS, &old_flags);
return end - size; return end - size;
} }
@ -63,7 +63,7 @@ namespace
void* rptr = static_cast<char*>(ptr) + size - aligned_size; void* rptr = static_cast<char*>(ptr) + size - aligned_size;
DWORD old_flags; DWORD old_flags;
VirtualProtect(rptr, aligned_size + PAGE_SIZE, PAGE_NOACCESS, &old_flags); VirtualProtect(rptr, aligned_size + page_size, PAGE_NOACCESS, &old_flags);
} }
} }
#elif defined(__APPLE__) || defined(__linux__) #elif defined(__APPLE__) || defined(__linux__)
@ -71,28 +71,28 @@ namespace
namespace namespace
{ {
const size_t PAGE_SIZE = 4096; const size_t page_size = 4096;
size_t align_to_page(size_t value) size_t align_to_page(size_t value)
{ {
return (value + PAGE_SIZE - 1) & ~(PAGE_SIZE - 1); return (value + page_size - 1) & ~(page_size - 1);
} }
void* allocate_page_aligned(size_t size) void* allocate_page_aligned(size_t size)
{ {
return mmap(0, size + PAGE_SIZE, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANON, -1, 0); return mmap(0, size + page_size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANON, -1, 0);
} }
void* allocate(size_t size) void* allocate(size_t size)
{ {
size_t aligned_size = align_to_page(size); size_t aligned_size = align_to_page(size);
void* ptr = allocate_page_aligned(aligned_size + PAGE_SIZE); void* ptr = allocate_page_aligned(aligned_size + page_size);
if (!ptr) return 0; if (!ptr) return 0;
char* end = static_cast<char*>(ptr) + aligned_size; char* end = static_cast<char*>(ptr) + aligned_size;
int res = mprotect(end, PAGE_SIZE, PROT_NONE); int res = mprotect(end, page_size, PROT_NONE);
assert(res == 0); assert(res == 0);
(void)!res; (void)!res;
@ -105,7 +105,7 @@ namespace
void* rptr = static_cast<char*>(ptr) + size - aligned_size; void* rptr = static_cast<char*>(ptr) + size - aligned_size;
int res = mprotect(rptr, aligned_size + PAGE_SIZE, PROT_NONE); int res = mprotect(rptr, aligned_size + page_size, PROT_NONE);
assert(res == 0); assert(res == 0);
(void)!res; (void)!res;
} }

3
tests/test_header_only.cpp
View File

@ -12,5 +12,8 @@ TEST(header_only)
xml_document doc; xml_document doc;
CHECK(doc.load_string(STR("<node/>"))); CHECK(doc.load_string(STR("<node/>")));
CHECK_STRING(doc.first_child().name(), STR("node")); CHECK_STRING(doc.first_child().name(), STR("node"));
#ifndef PUGIXML_NO_XPATH
CHECK(doc.first_child() == doc.select_node(STR("//*")).node()); CHECK(doc.first_child() == doc.select_node(STR("//*")).node());
#endif
} }

2
tests/test_write.cpp
View File

@ -123,7 +123,7 @@ TEST(write_pi_invalid)
node.set_name(STR("test")); node.set_name(STR("test"));
node.set_value(STR("?")); node.set_value(STR("?"));
CHECK_NODE(doc, STR("<?test ?" "?>")); CHECK_NODE(doc, STR("<?test ?") STR("?>"));
node.set_value(STR("?>")); node.set_value(STR("?>"));