diff options
-rw-r--r-- | ACE/ChangeLog | 8 | ||||
-rw-r--r-- | ACE/bin/PerlACE/Run_Test.pm | 5 | ||||
-rw-r--r-- | ACE/tests/Mem_Map_Test.cpp | 16 |
3 files changed, 21 insertions, 8 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index a39662548b4..3546da3a73a 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,11 @@ +Mon May 28 18:06:55 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl> + + * bin/PerlACE/Run_Test.pm: + Added is_vxworks_rtp_test method + + * tests/Mem_Map_Test.cpp: + VxWorks only allows to use mmap with a special shared memory file + Sun May 27 14:09:54 UTC 2007 Abdullah Sowayan <abdullah.sowayan@lmco.com> * netsvcs/clients/Naming/Client/Client_Test.cpp: diff --git a/ACE/bin/PerlACE/Run_Test.pm b/ACE/bin/PerlACE/Run_Test.pm index b540302bd11..540b1b7abc0 100644 --- a/ACE/bin/PerlACE/Run_Test.pm +++ b/ACE/bin/PerlACE/Run_Test.pm @@ -174,6 +174,11 @@ sub is_vxworks_test() return ($PerlACE::VxWorks_Test || $PerlACE::VxWorks_RTP_Test); } +sub is_vxworks_rtp_test() +{ + return ($PerlACE::VxWorks_RTP_Test); +} + sub add_path { my $name = shift; my $value = shift; diff --git a/ACE/tests/Mem_Map_Test.cpp b/ACE/tests/Mem_Map_Test.cpp index f39c12f5cde..10a59501e02 100644 --- a/ACE/tests/Mem_Map_Test.cpp +++ b/ACE/tests/Mem_Map_Test.cpp @@ -71,7 +71,7 @@ create_test_file (ACE_TCHAR *filename, int line_length, int num_lines) ACE_NEW_RETURN (mybuf, char[line_length + 1], -1); const char *c = ACE_ALPHABET; const char *d = c; -#if defined (__QNXNTO__) +#if defined (__QNXNTO__) || (defined (ACE_VXWORKS) && (ACE_VXWORKS <= 0x640)) // For NTO has to applied to open the file, as Mem_Map can map only shared memory ACE_Mem_Map mmap_4_open; mmap_4_open.open (filename, O_RDWR | O_CREAT | O_TRUNC, ACE_DEFAULT_FILE_PERMS); @@ -119,7 +119,7 @@ create_test_file (ACE_TCHAR *filename, int line_length, int num_lines) -1); } } -#if defined (__QNXNTO__) +#if defined (__QNXNTO__) || (defined (ACE_VXWORKS) && (ACE_VXWORKS <= 0x640)) mmap_4_open.close(); #else ACE_OS::close (file_handle); @@ -138,9 +138,9 @@ run_main (int, ACE_TCHAR *[]) #if !defined (ACE_LACKS_MMAP) -#if defined (__QNXNTO__) +#if defined (__QNXNTO__) || (defined (ACE_VXWORKS) && (ACE_VXWORKS <= 0x640)) ACE_ERROR ((LM_INFO, - ACE_TEXT ("mmap on QNX Neutrino can map only shared memory files\n"))); + ACE_TEXT ("mmap on QNX Neutrino/VxWorks can map only shared memory files\n"))); #endif // = Initialize the temporary variable names @@ -184,7 +184,7 @@ run_main (int, ACE_TCHAR *[]) -1); // Now create a temporary file for intermediate processing -#if defined (__QNXNTO__) +#if defined (__QNXNTO__) || (defined (ACE_VXWORKS) && (ACE_VXWORKS <= 0x640)) ACE_Mem_Map mmap_4_open; mmap_4_open.open(temp_file1, O_RDWR | O_TRUNC | O_CREAT, @@ -206,7 +206,7 @@ run_main (int, ACE_TCHAR *[]) reverse_file (temp_file_handle, (char *) mmap.addr (), mmap.size ()); -#if defined (__QNXNTO__) +#if defined (__QNXNTO__) || (defined (ACE_VXWORKS) && (ACE_VXWORKS <= 0x640)) mmap_4_open.close(); #else ACE_OS::close (temp_file_handle); @@ -221,7 +221,7 @@ run_main (int, ACE_TCHAR *[]) ACE_TEXT ("mmap"), temp_file1), -1); -#if defined (__QNXNTO__) +#if defined (__QNXNTO__) || (defined (ACE_VXWORKS) && (ACE_VXWORKS <= 0x640)) mmap_4_open.open(temp_file2, O_RDWR | O_TRUNC | O_CREAT, ACE_DEFAULT_FILE_PERMS); @@ -240,7 +240,7 @@ run_main (int, ACE_TCHAR *[]) reverse_file (temp_file_handle, (char *) temp_mmap.addr (), temp_mmap.size ()); -#if defined (__QNXNTO__) +#if defined (__QNXNTO__) || (defined (ACE_VXWORKS) && (ACE_VXWORKS <= 0x640)) mmap_4_open.close(); #else ACE_OS::close (temp_file_handle); |