diff options
| -rw-r--r-- | ChangeLog | 17 | ||||
| -rw-r--r-- | m4/aio.m4 | 84 | ||||
| -rw-r--r-- | m4/config_h.m4 | 3 | ||||
| -rw-r--r-- | tests/Makefile.am | 3 | ||||
| -rwxr-xr-x | tests/run_test.pl | 7 |
5 files changed, 74 insertions, 40 deletions
diff --git a/ChangeLog b/ChangeLog index 3613e0fb55e..9a2e88b6ae0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,20 @@ +Mon Dec 6 18:16:39 2004 Steve Huston <shuston@riverace.com> + + * m4/config_h.m4: Added AH_TEMPLATE for ACE_HAS_POSIX_REALTIME_SIGNALS. + + * m4/aio.m4: Split the realtime-signals check out of the AIO + functionality check. If the basic AIO calls are available and + functional, then check if the signal-based AIO test works. If so, + set ACE_HAS_POSIX_REALTIME_SIGNALS. + + * tests/Makefile.am: Include the run_test.pl script in TESTS and + note it as a dist_check_SCRIPTS, not noinst_SCRIPTS. This lets + "make check" run it. + + * tests/run_test.pl: Add $top_srcdir to the path for locating + Perl auxiliary modules. For automake builds, this is needed since + the script isn't linked into the build tree. + Mon Dec 6 16:34:29 2004 Steve Huston <shuston@riverace.com> * ACE-INSTALL.html: Removed mention and instructions for the 'clone' diff --git a/m4/aio.m4 b/m4/aio.m4 index 63574e66ff3..5c8e79801da 100644 --- a/m4/aio.m4 +++ b/m4/aio.m4 @@ -275,10 +275,37 @@ main () return 0; } ]])],[ - dnl Now try another test + ace_cv_feature_aio_calls=yes + ],[ + ace_cv_feature_aio_calls=no + ],[ + dnl Asynchronous IO test for cross-compiled platforms + dnl This test is weaker than the above run-time tests but it will + dnl have to do. + AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM([[ +#include <aio.h> + ]], + [[ + aiocb* aiocb_ptr (void); + ]])], + [ + ace_cv_feature_aio_calls=yes + ], + [ + ace_cv_feature_aio_calls=no + ]) + ]) + ],[AC_DEFINE([ACE_HAS_AIO_CALLS])],[LIBS="$ace_save_LIBS"]) +fi dnl test "$ace_has_aio_funcs" = yes + - dnl Create a file for the test program to read. - cat > test_aiosig.txt <<EOF +if test "$ace_cv_feature_aio_calls" = yes; then + ACE_CACHE_CHECK([for working POSIX realtime signals], + [ace_cv_feature_posix_rt_sigs], + [ + dnl Create a file for the test program to read. + cat > test_aiosig.txt <<EOF ******************************************************* FOO BAR FOO BAR FOO BAR FOO BAR FOO BAR FOO BAR FOO BAR @@ -286,8 +313,8 @@ FOO BAR FOO BAR FOO BAR FOO BAR FOO BAR FOO BAR FOO BAR EOF - AC_RUN_IFELSE( - [AC_LANG_SOURCE([[ + AC_RUN_IFELSE( + [AC_LANG_SOURCE([[ #ifndef ACE_LACKS_UNISTD_H #include <unistd.h> #endif @@ -583,41 +610,22 @@ main () return -1; } - ]])], - [ - ace_cv_feature_aio_calls=yes - ], - [ - ace_cv_feature_aio_calls=no - ], - [ + ]])], + [ + ace_cv_feature_posix_rt_sigs=yes + ], + [ + ace_cv_feature_posix_rt_sigs=no + ], + [ dnl Don't bother doing anything for cross-compiling here - dnl since the outer run-time test will prevent this - dnl inner run-time test from ever running when cross-compiling. + dnl since the basic aio run-time test will prevent this + dnl rt sig run-time test from ever running when cross-compiling. dnl We just put something in here to prevent autoconf dnl from complaining. ace_just_a_place_holder=ignoreme - ]) - ],[ - ace_cv_feature_aio_calls=no - ],[ - dnl Asynchronous IO test for cross-compiled platforms - dnl This test is weaker than the above run-time tests but it will - dnl have to do. - AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM([[ -#include <aio.h> - ]], - [[ - aiocb* aiocb_ptr (void); - ]])], - [ - ace_cv_feature_aio_calls=yes - ], - [ - ace_cv_feature_aio_calls=no - ]) - ]) - ],[AC_DEFINE([ACE_HAS_AIO_CALLS])],[LIBS="$ace_save_LIBS"]) -fi dnl test "$ace_has_aio_funcs" = yes + ]) + ],[AC_DEFINE([ACE_HAS_POSIX_REALTIME_SIGNALS])],[]) +fi dnl test "$ace_cv_feature_aio_calls" = yes + ]) diff --git a/m4/config_h.m4 b/m4/config_h.m4 index b87330fd816..7b14538d619 100644 --- a/m4/config_h.m4 +++ b/m4/config_h.m4 @@ -542,6 +542,9 @@ AH_TEMPLATE([ACE_HAS_POSIX_GETPWNAM_R], AH_TEMPLATE([ACE_HAS_POSIX_NONBLOCK], [Platform supports POSIX O_NONBLOCK semantics]) +AH_TEMPLATE([ACE_HAS_POSIX_REALTIME_SIGNALS], +[Platform supports POSIX realtime signals]) + AH_TEMPLATE([ACE_HAS_POSIX_SEM], [Platform supports POSIX real-time semaphores (e.g., VxWorks and Solaris)]) diff --git a/tests/Makefile.am b/tests/Makefile.am index 2a56b8d6fa8..6163819fe79 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -20,7 +20,8 @@ SUBDIRS = \ noinst_PROGRAMS = ## Makefile.Test_Output.am -noinst_SCRIPTS = run_test.lst run_test.pl +dist_check_SCRIPTS = run_test.lst run_test.pl +TESTS = run_test.pl noinst_LTLIBRARIES = libTest_Output.la diff --git a/tests/run_test.pl b/tests/run_test.pl index 4393a012876..2dcde14b0cb 100755 --- a/tests/run_test.pl +++ b/tests/run_test.pl @@ -7,7 +7,12 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' # This file is for running the tests in the ACE tests directory. # It is usually used for auto_compiles. -use lib "$ENV{ACE_ROOT}/bin"; +if (defined $ENV{ACE_ROOT}) { + use lib "$ENV{ACE_ROOT}/bin"; +} +if (defined $ENV{top_srcdir}) { + use lib "$ENV{top_srcdir}/bin"; +} use PerlACE::Run_Test; use Cwd; |