diff options
| author | Steve Huston <shuston@riverace.com> | 2005-07-29 18:27:22 +0000 |
|---|---|---|
| committer | Steve Huston <shuston@riverace.com> | 2005-07-29 18:27:22 +0000 |
| commit | 42c1dbaf8e241407a5c43b8793dd080b7c8fd22e (patch) | |
| tree | 01f4f8f24a8a358fedac9f6c5997d8c1c6332462 | |
| parent | 08212df3a0a8c89e47bce4ba168855563d832e6b (diff) | |
| download | ATCD-42c1dbaf8e241407a5c43b8793dd080b7c8fd22e.tar.gz | |
ChangeLogTag:Fri Jul 29 14:25:12 2005 Steve Huston <shuston@riverace.com>
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | ace/config-aix-5.x.h | 9 | ||||
| -rwxr-xr-x | tests/run_test.pl | 4 |
3 files changed, 21 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 1d59ce6081b..76eb0d09b25 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +Fri Jul 29 14:25:12 2005 Steve Huston <shuston@riverace.com> + + * ace/config-aix-5.x.h: Disable ACE_HAS_POSIX_SEM if the Posix + flags indicate its presence but _XOPEN_SOURCE is not >= 500. + + * tests/run_test.pl: When looking for sub-log files, match the program + name only at the start. Prevents finding, for example, + Process_Manual_Event_Test-child.log when looking for + Manual_Event_Test-*.log. + Fri Jul 29 14:26:37 2005 Simon McQueen <sm@prismtech.com> * bin/tao_other_tests.lst: diff --git a/ace/config-aix-5.x.h b/ace/config-aix-5.x.h index b14a375d2ae..af38945f687 100644 --- a/ace/config-aix-5.x.h +++ b/ace/config-aix-5.x.h @@ -34,6 +34,15 @@ # undef _ACE_DISABLE_AIO_CALLS_ #endif +// AIX's /usr/include/unistd.h sets _POSIX_SEMAPHORE to indicate the system +// supplies such a facility, but the headers don't enable it unless +// _XOPEN_SOURCE >= 500. So disable semaphores here if _XOPEN_SOURCE isn't +// up to snuff. +#if defined (ACE_HAS_POSIX_SEM) && \ + (!defined (_XOPEN_SOURCE) || (_XOPEN_SOURCE-0 < 500)) +# undef ACE_HAS_POSIX_SEM +#endif + // I think this is correct, but needs to be verified... -Steve Huston #define ACE_HAS_SIGTIMEDWAIT diff --git a/tests/run_test.pl b/tests/run_test.pl index fd545d23886..6aa08705d9e 100755 --- a/tests/run_test.pl +++ b/tests/run_test.pl @@ -314,7 +314,7 @@ sub check_log ($) # sub-log has an error, print the sub-log. opendir (THISDIR, "log"); local $sublognames = "$program\-.*".$log_suffix; - @sublogs = grep (/$sublognames/, readdir (THISDIR)); + @sublogs = grep (/^$sublognames/, readdir (THISDIR)); closedir (THISDIR); foreach $log (@sublogs) { # Just like the main log, but no start/end check @@ -353,7 +353,7 @@ sub check_log ($) } if ($number_starting != $number_ending) { - print STDERR "Error ($log): Nuber of 'Starting' does not match number of 'Ending' ($number_starting != $number_ending)\n"; + print STDERR "Error ($log): Number of 'Starting' does not match number of 'Ending' ($number_starting != $number_ending)\n"; $print_log = 1; } |