diff options
Diffstat (limited to 'testsuites')
-rw-r--r-- | testsuites/ChangeLog | 1 | ||||
-rw-r--r-- | testsuites/configure.ac | 21 | ||||
-rw-r--r-- | testsuites/libtests/ChangeLog | 1 | ||||
-rw-r--r-- | testsuites/libtests/configure.ac | 2 | ||||
-rw-r--r-- | testsuites/mptests/ChangeLog | 1 | ||||
-rw-r--r-- | testsuites/mptests/configure.ac | 4 | ||||
-rw-r--r-- | testsuites/samples/ChangeLog | 1 | ||||
-rw-r--r-- | testsuites/samples/configure.ac | 9 |
8 files changed, 20 insertions, 20 deletions
diff --git a/testsuites/ChangeLog b/testsuites/ChangeLog index 4352d43c7b..82b3cbbf6e 100644 --- a/testsuites/ChangeLog +++ b/testsuites/ChangeLog @@ -1,5 +1,6 @@ 2005-11-09 Ralf Corsepius <ralf.corsepius@rtems.org> + * configure.ac: Apply RTEMS_CHECK_CPUOPTS. * aclocal/prog-cc.m4: Apply cpukit_root, project_root to set up GCCSPECS. * aclocal/check-cpuopts.m4: Apply cpukit_root, project_root to set diff --git a/testsuites/configure.ac b/testsuites/configure.ac index 31cea9720f..b7046ec83f 100644 --- a/testsuites/configure.ac +++ b/testsuites/configure.ac @@ -12,22 +12,20 @@ RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define foreign 1.9]) AM_MAINTAINER_MODE -RTEMS_ENABLE_POSIX -RTEMS_ENABLE_ITRON -RTEMS_ENABLE_NETWORKING -RTEMS_ENABLE_CXX -RTEMS_ENABLE_BARE RTEMS_ENABLE_TESTS +RTEMS_ENABLE_CXX RTEMS_ENV_RTEMSBSP RTEMS_PROJECT_ROOT RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) -RTEMS_CHECK_MULTIPROCESSING(RTEMS_BSP) -RTEMS_CHECK_POSIX_API(RTEMS_BSP) -RTEMS_CHECK_ITRON_API(RTEMS_BSP) -RTEMS_CHECK_TESTS +RTEMS_PROG_CC + +RTEMS_CHECK_CPUOPTS([RTEMS_POSIX_API]) +RTEMS_CHECK_CPUOPTS([RTEMS_ITRON_API]) +RTEMS_CHECK_CPUOPTS([RTEMS_MULTIPROCESSING]) +RTEMS_CHECK_CPUOPTS([RTEMS_NETWORKING]) case $enable_tests in yes | samples ) @@ -38,7 +36,7 @@ esac if test "$enable_tests" = "yes"; then # do functionality tests first, then performance tests AC_CONFIG_SUBDIRS(libtests sptests) - if test "$HAS_MP" = "yes"; then + if test "$rtems_cv_HAS_MULTIPROCESSING" = "yes"; then AC_CONFIG_SUBDIRS(mptests) fi if test "$rtems_cv_HAS_POSIX_API" = "yes"; then @@ -62,6 +60,5 @@ AM_CONDITIONAL([AMPOLISH3],[test x"$USE_MAINTAINER_MODE" = x"yes" \ && test -n "$AMPOLISH3"]) # Explicitly list all Makefiles here -AC_CONFIG_FILES([Makefile -]) +AC_CONFIG_FILES([Makefile]) AC_OUTPUT diff --git a/testsuites/libtests/ChangeLog b/testsuites/libtests/ChangeLog index 705058b6d1..3308788dfa 100644 --- a/testsuites/libtests/ChangeLog +++ b/testsuites/libtests/ChangeLog @@ -1,5 +1,6 @@ 2005-11-09 Ralf Corsepius <ralf.corsepius@rtems.org> + * configure.ac: Apply RTEMS_CHECK_CPUOPTS. * libtests.am: Set project_bspdir=$(PROJECT_ROOT) 2005-11-07 Ralf Corsepius <ralf.corsepius@rtems.org> diff --git a/testsuites/libtests/configure.ac b/testsuites/libtests/configure.ac index dd11c4b4a2..0226f18e42 100644 --- a/testsuites/libtests/configure.ac +++ b/testsuites/libtests/configure.ac @@ -32,7 +32,7 @@ RTEMS_CHECK_CXX(RTEMS_BSP) AC_SUBST(BARE_CPU_CFLAGS) AC_SUBST(BARE_CPU_MODEL) -AM_CONDITIONAL(HAS_CXX,test "$HAS_CPLUSPLUS" = "yes") +AM_CONDITIONAL(HAS_CXX,test "$rtems_cv_HAS_CPLUSPLUS" = "yes") # Explicitly list all Makefiles here AC_CONFIG_FILES([Makefile diff --git a/testsuites/mptests/ChangeLog b/testsuites/mptests/ChangeLog index a17cb99f69..222be2e9e4 100644 --- a/testsuites/mptests/ChangeLog +++ b/testsuites/mptests/ChangeLog @@ -1,5 +1,6 @@ 2005-11-09 Ralf Corsepius <ralf.corsepius@rtems.org> + * configure.ac: Apply RTEMS_CHECK_CPUOPTS. * mptests.am: Set project_bspdir=$(PROJECT_ROOT) 2005-11-07 Ralf Corsepius <ralf.corsepius@rtems.org> diff --git a/testsuites/mptests/configure.ac b/testsuites/mptests/configure.ac index 56e9a16da3..a42897e3de 100644 --- a/testsuites/mptests/configure.ac +++ b/testsuites/mptests/configure.ac @@ -23,12 +23,12 @@ RTEMS_PROG_CC_FOR_TARGET([-ansi -fasm]) RTEMS_CANONICALIZE_TOOLS RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) -RTEMS_CHECK_MULTIPROCESSING +RTEMS_CHECK_CPUOPTS([RTEMS_MULTIPROCESSING]) AC_SUBST(BARE_CPU_CFLAGS) AC_SUBST(BARE_CPU_MODEL) -AM_CONDITIONAL(HAS_MP,test "$HAS_MP" = "yes") +AM_CONDITIONAL(HAS_MP,test "$rtems_cv_RTEMS_MULTIPROCESSING" = "yes") MAX_LONG_TEST_DURATION=${MAX_LONG_TEST_DURATION-100} AC_ARG_VAR([MAX_LONG_TEST_DURATION], diff --git a/testsuites/samples/ChangeLog b/testsuites/samples/ChangeLog index f485b77fe4..dd11d632bf 100644 --- a/testsuites/samples/ChangeLog +++ b/testsuites/samples/ChangeLog @@ -1,5 +1,6 @@ 2005-11-09 Ralf Corsepius <ralf.corsepius@rtems.org> + * configure.ac: Apply RTEMS_CHECK_CPUOPTS. * sample.am: Set project_bspdir=$(PROJECT_ROOT) 2005-11-07 Ralf Corsepius <ralf.corsepius@rtems.org> diff --git a/testsuites/samples/configure.ac b/testsuites/samples/configure.ac index 779cbdb8b7..292200184f 100644 --- a/testsuites/samples/configure.ac +++ b/testsuites/samples/configure.ac @@ -12,7 +12,6 @@ RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define foreign 1.9]) AM_MAINTAINER_MODE -RTEMS_ENABLE_NETWORKING RTEMS_ENABLE_CXX RTEMS_ENABLE_BARE @@ -26,9 +25,9 @@ RTEMS_PROG_CXX_FOR_TARGET RTEMS_CANONICALIZE_TOOLS RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) -RTEMS_CHECK_MULTIPROCESSING(RTEMS_BSP) +RTEMS_CHECK_CPUOPTS([RTEMS_MULTIPROCESSING]) RTEMS_CHECK_CXX(RTEMS_BSP) -RTEMS_CHECK_NETWORKING +RTEMS_CHECK_CPUOPTS([RTEMS_NETWORKING]) CXXTESTS=$HAS_CPLUSPLUS @@ -54,8 +53,8 @@ AS_IF([test $HAS_CPLUSPLUS = yes],[ ]) AM_CONDITIONAL([CXXTESTS],[test $CXXTESTS = "yes"]) -AM_CONDITIONAL(NETTESTS,test "$HAS_NETWORKING" = "yes") -AM_CONDITIONAL(MPTESTS,test "$HAS_MP" = "yes") +AM_CONDITIONAL(NETTESTS,test "$rtems_cv_RTEMS_NETWORKING" = "yes") +AM_CONDITIONAL(MPTESTS,test "$rtems_cv_RTEMS_MULTIPROCESSING" = "yes") #FIXME: We should use a feature based check AM_CONDITIONAL(LIBCHIP,[test "$RTEMS_BSP_FAMILY" != "posix"]) |