diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2008-09-29 18:05:04 +0000 |
---|---|---|
committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2008-09-29 18:05:04 +0000 |
commit | e25ee58e45edbfe82d24db15aa466984605bf162 (patch) | |
tree | 6c39474853737e63d1e659019afe87f2274a8305 | |
parent | acc2871552bf696c6ae8cd0dca41cad80d6b8206 (diff) | |
download | ATCD-e25ee58e45edbfe82d24db15aa466984605bf162.tar.gz |
Mon Sep 29 18:04:00 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>
-rw-r--r-- | ACE/ChangeLog | 6 | ||||
-rw-r--r-- | ACE/tests/CDR_File_Test.cpp | 2 | ||||
-rw-r--r-- | ACE/tests/Log_Msg_Test.cpp | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 02c131a7559..4f66e762018 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,9 @@ +Mon Sep 29 18:04:00 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> + + * tests/CDR_File_Test.cpp: + * tests/Log_Msg_Test.cpp: + VxWorks 6.6 can't unlink in advance on NFS + Mon Sep 29 13:36:00 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> * bin/MakeProjectCreator/config/acedefaults.mpb: diff --git a/ACE/tests/CDR_File_Test.cpp b/ACE/tests/CDR_File_Test.cpp index 30ca4d8b636..63b82905f42 100644 --- a/ACE/tests/CDR_File_Test.cpp +++ b/ACE/tests/CDR_File_Test.cpp @@ -411,7 +411,7 @@ run_main (int argc, ACE_TCHAR *argv[]) filename.get_path_name ()), 1); -#if !defined (ACE_VXWORKS) && !defined (ACE_HAS_PHARLAP) || (defined(ACE_VXWORKS) && (ACE_VXWORKS >= 0x640)) +#if !defined (ACE_VXWORKS) && !defined (ACE_HAS_PHARLAP) || (defined(ACE_VXWORKS) && (ACE_VXWORKS > 0x660)) # define TEST_CAN_UNLINK_IN_ADVANCE #endif diff --git a/ACE/tests/Log_Msg_Test.cpp b/ACE/tests/Log_Msg_Test.cpp index 01c6b791b68..972c3d541fa 100644 --- a/ACE/tests/Log_Msg_Test.cpp +++ b/ACE/tests/Log_Msg_Test.cpp @@ -398,7 +398,7 @@ test_ostream (void) 1); } -#if !defined (ACE_VXWORKS) && !defined (ACE_HAS_PHARLAP) || (defined(ACE_VXWORKS) && (ACE_VXWORKS >= 0x650)) +#if !defined (ACE_VXWORKS) && !defined (ACE_HAS_PHARLAP) || (defined(ACE_VXWORKS) && (ACE_VXWORKS > 0x660)) # define TEST_CAN_UNLINK_IN_ADVANCE #endif |