diff options
| author | elliott_c <ocielliottc@users.noreply.github.com> | 2008-04-10 13:27:02 +0000 |
|---|---|---|
| committer | elliott_c <ocielliottc@users.noreply.github.com> | 2008-04-10 13:27:02 +0000 |
| commit | 769b17e88a0be5d388d3b501276dce8ec6206eb6 (patch) | |
| tree | fd64f7ee555f890f41f3badfe17dc2f5dfd57af2 | |
| parent | ebe06642a5cf870b499998515ba71d6d8c0a6718 (diff) | |
| download | ATCD-769b17e88a0be5d388d3b501276dce8ec6206eb6.tar.gz | |
ChangeLogTag: Thu Apr 10 13:27:13 UTC 2008 Chad Elliott <elliott_c@ociweb.com>
| -rw-r--r-- | ACE/ChangeLog | 7 | ||||
| -rw-r--r-- | ACE/tests/Bug_2980_Regression_Test.cpp | 8 |
2 files changed, 11 insertions, 4 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 9d017b8212d..87773a62fa5 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,10 @@ +Thu Apr 10 13:27:13 UTC 2008 Chad Elliott <elliott_c@ociweb.com> + + * tests/Bug_2980_Regression_Test.cpp: + + Fixed compilation issues and reversed the CAN_RUN_TEST check to + get it to run on non-win32 and non-vxworks operating systems. + Thu Apr 10 10:11:57 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> * ace/Dynamic_Service.inl: diff --git a/ACE/tests/Bug_2980_Regression_Test.cpp b/ACE/tests/Bug_2980_Regression_Test.cpp index dd982415c8c..38179742ea6 100644 --- a/ACE/tests/Bug_2980_Regression_Test.cpp +++ b/ACE/tests/Bug_2980_Regression_Test.cpp @@ -2,6 +2,7 @@ #include <iostream> #include <assert.h> +#include <stdio.h> // This is a non-ACE driver program which loads an ACE-based DLL. // The usual ACE-related defines will not apply and we must use @@ -105,7 +106,7 @@ void * loadunloadDll(void *pp) int main(int, char **) { -#if defined (CAN_RUN_TEST) +#if !defined (CAN_RUN_TEST) #if defined (__BORLANDC__) std::printf ("Terminating because this test has not been designed " @@ -116,11 +117,10 @@ int main(int, char **) #endif #else - int result = 0; - printf ("main - entered\n"); # ifdef USE_THREAD + int result = 0; pthread_t tid1; result = pthread_create(&tid1, 0, &loadDll, 0); if (result != 0) @@ -132,7 +132,7 @@ int main(int, char **) printf ("loadDll thread finished\n"); # else loadDll(0); - printf ("loadDll finished"\n); + printf ("loadDll finished\n"); # endif # ifdef USE_THREAD |