summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2007-05-23 07:18:25 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2007-05-23 07:18:25 +0000
commit3cc409b7f7005431894df95895a2326168137eb7 (patch)
tree8e14309e0b4dc9b462b8c95695fff344c2c24492
parentf298c2f15850fd7c07c04f9ab19b4fe0cf72229d (diff)
downloadATCD-3cc409b7f7005431894df95895a2326168137eb7.tar.gz
Wed May 23 07:17:55 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>
-rw-r--r--ACE/ChangeLog8
-rw-r--r--ACE/tests/Mem_Map_Test.cpp12
2 files changed, 13 insertions, 7 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 8d06082fdbc..c998d3f92a6 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,4 +1,10 @@
-Tue May 23 05:12:04 2007 Ossama Othman <ossama othman at symantec dot com>
+Wed May 23 07:17:55 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * tests/Mem_Map_Test.cpp:
+ Added filenames to the mmap error messages so that we can see which
+ mmap failed
+
+Wed May 23 05:12:04 2007 Ossama Othman <ossama othman at symantec dot com>
* ace/OS_NS_math.h (ace_log2_helper):
diff --git a/ACE/tests/Mem_Map_Test.cpp b/ACE/tests/Mem_Map_Test.cpp
index 8deba91d1a6..1c1cf0686e7 100644
--- a/ACE/tests/Mem_Map_Test.cpp
+++ b/ACE/tests/Mem_Map_Test.cpp
@@ -179,7 +179,7 @@ run_main (int, ACE_TCHAR *[])
if (mmap.map (test_file) == -1)
ACE_ERROR_RETURN ((LM_ERROR,
ACE_TEXT ("%n: %p\n%a"),
- ACE_TEXT ("mmap")),
+ ACE_TEXT ("mmap ace_mem_map_test")),
-1);
// Now create a temporary file for intermediate processing
@@ -205,7 +205,7 @@ run_main (int, ACE_TCHAR *[])
reverse_file (temp_file_handle,
(char *) mmap.addr (),
mmap.size ());
-#if defined (__QNXNTO__)
+#if defined (__QNXNTO__)
mmap_4_open.close();
#else
ACE_OS::close (temp_file_handle);
@@ -217,9 +217,9 @@ run_main (int, ACE_TCHAR *[])
if (temp_mmap.map (temp_file1) == -1)
ACE_ERROR_RETURN ((LM_ERROR,
ACE_TEXT ("%n: %p\n%a"),
- ACE_TEXT ("mmap")),
+ ACE_TEXT ("mmap ace_mem_map_temp_")),
-1);
-#if defined (__QNXNTO__)
+#if defined (__QNXNTO__)
mmap_4_open.open(temp_file2,
O_RDWR | O_TRUNC | O_CREAT,
ACE_DEFAULT_FILE_PERMS);
@@ -238,7 +238,7 @@ run_main (int, ACE_TCHAR *[])
reverse_file (temp_file_handle,
(char *) temp_mmap.addr (),
temp_mmap.size ());
-#if defined (__QNXNTO__)
+#if defined (__QNXNTO__)
mmap_4_open.close();
#else
ACE_OS::close (temp_file_handle);
@@ -250,7 +250,7 @@ run_main (int, ACE_TCHAR *[])
if (temp_mmap2.map (temp_file2) == -1)
ACE_ERROR_RETURN ((LM_ERROR,
ACE_TEXT ("%n: %p\n%a"),
- ACE_TEXT ("mmap")),
+ ACE_TEXT ("mmap ace_mem_map_temp_")),
-1);
// Now do a memcmp -- the orig file and the second temporary file