From 740a7bc6d757a462f7acb7c8cdffcb1859a6d28d Mon Sep 17 00:00:00 2001 From: Olli Savia Date: Wed, 4 Nov 2009 14:53:15 +0000 Subject: ChangeLogTag: Wed Nov 4 14:51:00 UTC 2009 Olli Savia --- ACE/ChangeLog | 14 +++++ ACE/tests/Bug_3758_Regression_Test.cpp | 112 +++++++++++++++++++++++++++++++++ ACE/tests/OS_Test.cpp | 73 --------------------- ACE/tests/run_test.lst | 1 + ACE/tests/tests.mpc | 7 +++ 5 files changed, 134 insertions(+), 73 deletions(-) create mode 100644 ACE/tests/Bug_3758_Regression_Test.cpp diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 946a389cc14..fc7a5e53525 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,17 @@ +Wed Nov 4 14:51:00 UTC 2009 Olli Savia + + * tests/Bug_3758_Regression_Test.cpp: + * tests/OS_Test.cpp: + * tests/run_test.lst: + * tests/tests.mpc: + Moved regression test for 3758 to its own file. + +Wed Nov 4 14:49:18 UTC 2009 Olli Savia + + * tests/Bug_3758_Regression_Test.cpp: + * tests/run_test.lst: + * tests/tests.mpc: + Wed Nov 4 11:39:05 UTC 2009 Johnny Willemsen * html/index.html: diff --git a/ACE/tests/Bug_3758_Regression_Test.cpp b/ACE/tests/Bug_3758_Regression_Test.cpp new file mode 100644 index 00000000000..fb90033e386 --- /dev/null +++ b/ACE/tests/Bug_3758_Regression_Test.cpp @@ -0,0 +1,112 @@ +// $Id$ + +// ============================================================================ +// +// = LIBRARY +// tests +// +// = DESCRIPTION +// This simple test exercises ACE_OS::fileno. +// +// = AUTHOR +// Olli Savia +// +// ============================================================================ + +#include "test_config.h" +#include "ace/OS_NS_stdio.h" +#include "ace/OS_NS_unistd.h" + +ACE_RCSID(tests, OS_Test, "$Id$") + +#undef THIS_IS_NOT_AN_ASSERT_IT_IS_A_NON_DEBUG_TEST_AS_WELL +#define THIS_IS_NOT_AN_ASSERT_IT_IS_A_NON_DEBUG_TEST_AS_WELL(X) \ + ((X) \ + ? static_cast(0) \ + : ACE_VERSIONED_NAMESPACE_NAME::__ace_assert(__FILE__, __LINE__, ACE_TEXT_CHAR_TO_TCHAR (#X))) + +// Test ACE_OS::fileno() +int +fileno_test (void) +{ + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT ("Testing fileno method\n"))); + + int test_status = 0; + + ACE_HANDLE fn; + + fn = ACE_OS::fileno (stdin); + if (fn == ACE_INVALID_HANDLE) + { + ACE_ERROR ((LM_ERROR, ACE_TEXT ("fileno(stdin) returned ACE_INVALID_HANDLE.\n"))); + test_status = -1; + } + else if (fn != ACE_STDIN) + { + ACE_ERROR ((LM_ERROR, ACE_TEXT ("stdin test failed.\n"))); + test_status = -1; + } + + fn = ACE_OS::fileno (stdout); + if (fn == ACE_INVALID_HANDLE) + { + ACE_ERROR ((LM_ERROR, ACE_TEXT ("fileno(stdout) returned ACE_INVALID_HANDLE.\n"))); + test_status = -1; + } + else +#if defined (ACE_WIN32) + // Check if stdout is not associated with an output stream. + // This is not an error. + if (fn == reinterpret_cast(-2)) + { + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("fileno(stdout) returned -2.\n"))); + } + else +#endif + if (fn != ACE_STDOUT) + { + ACE_ERROR ((LM_ERROR, ACE_TEXT ("stdout test failed.\n"))); + test_status = -1; + } + + fn = ACE_OS::fileno (stderr); + if (fn == ACE_INVALID_HANDLE) + { + ACE_ERROR ((LM_ERROR, ACE_TEXT ("fileno(stderr) returned ACE_INVALID_HANDLE.\n"))); + test_status = -1; + } + else +#if defined (ACE_WIN32) + // Check if stderr is not associated with an output stream. + // This is not an error. + if (fn == reinterpret_cast(-2)) + { + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("fileno(stderr) returned -2.\n"))); + } + else +#endif + if (fn != ACE_STDERR) + { + ACE_ERROR ((LM_ERROR, ACE_TEXT ("stderr test failed.\n"))); + test_status = -1; + } + + return test_status; +} + +int +run_main (int, ACE_TCHAR *[]) +{ + ACE_START_TEST (ACE_TEXT ("Bug_3758_Regression_Test")); + + int status = 0; + int result; + + if ((result = fileno_test ()) != 0) + status = -1; + + ACE_END_TEST; + return status; +} +#undef THIS_IS_NOT_AN_ASSERT_IT_IS_A_NON_DEBUG_TEST_AS_WELL diff --git a/ACE/tests/OS_Test.cpp b/ACE/tests/OS_Test.cpp index 7d74d5baf5d..cca9e59048a 100644 --- a/ACE/tests/OS_Test.cpp +++ b/ACE/tests/OS_Test.cpp @@ -67,76 +67,6 @@ access_test (void) return test_status; } -// Test ACE_OS::fileno() -int -fileno_test (void) -{ - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("Testing fileno method\n"))); - - int test_status = 0; - - ACE_HANDLE fn; - - fn = ACE_OS::fileno (stdin); - if (fn == ACE_INVALID_HANDLE) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("fileno(stdin) returned ACE_INVALID_HANDLE.\n"))); - test_status = -1; - } - else if (fn != ACE_STDIN) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("stdin test failed.\n"))); - test_status = -1; - } - - fn = ACE_OS::fileno (stdout); - if (fn == ACE_INVALID_HANDLE) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("fileno(stdout) returned ACE_INVALID_HANDLE.\n"))); - test_status = -1; - } - else -#if defined (ACE_WIN32) - // Check if stdout is not associated with an output stream. - // This is not an error. - if (fn == reinterpret_cast(-2)) - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("fileno(stdout) returned -2.\n"))); - } - else -#endif - if (fn != ACE_STDOUT) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("stdout test failed.\n"))); - test_status = -1; - } - - fn = ACE_OS::fileno (stderr); - if (fn == ACE_INVALID_HANDLE) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("fileno(stderr) returned ACE_INVALID_HANDLE.\n"))); - test_status = -1; - } - else -#if defined (ACE_WIN32) - // Check if stderr is not associated with an output stream. - // This is not an error. - if (fn == reinterpret_cast(-2)) - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("fileno(stderr) returned -2.\n"))); - } - else -#endif - if (fn != ACE_STDERR) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("stderr test failed.\n"))); - test_status = -1; - } - - return test_status; -} - // Test ACE_OS::rename to be sure the files come and go as expected. int rename_test (void) @@ -1290,9 +1220,6 @@ run_main (int, ACE_TCHAR *[]) if ((result = access_test ()) != 0) status = result; - if ((result = fileno_test ()) != 0) - status = result; - if ((result = rename_test ()) != 0) status = result; diff --git a/ACE/tests/run_test.lst b/ACE/tests/run_test.lst index b50e9641cb9..198a9184c00 100644 --- a/ACE/tests/run_test.lst +++ b/ACE/tests/run_test.lst @@ -57,6 +57,7 @@ Bug_3709_Regression_Test: !LabVIEW_RT Bug_3710_Regression_Test Bug_3729_Regression_Test: !FIXED_BUGS_ONLY Bug_3744_Regression_Test: !FIXED_BUGS_ONLY +Bug_3758_Regression_Test: !FIXED_BUGS_ONLY CDR_Array_Test: !ACE_FOR_TAO CDR_File_Test: !ACE_FOR_TAO CDR_Test diff --git a/ACE/tests/tests.mpc b/ACE/tests/tests.mpc index fce9730d22b..48032006dc6 100644 --- a/ACE/tests/tests.mpc +++ b/ACE/tests/tests.mpc @@ -398,6 +398,13 @@ project(Bug_3744_Regression_Test) : acetest { } } +project(Bug_3758_Regression_Test) : acetest { + exename = Bug_3758_Regression_Test + Source_Files { + Bug_3758_Regression_Test.cpp + } +} + project(Cache Map Manager Test) : acetest { exename = Cache_Map_Manager_Test Source_Files { -- cgit v1.2.1