From e41e3fe75ddf0c2316f33948e585d5f4e66e1b98 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Fri, 22 Aug 2003 06:00:38 +0000 Subject: 2003-08-22 Ralf Corsepius * aclocal/enable-tests.m4: Change to support --enable-tests=no|yes|samples, default is samples. * configure.ac: Reflect changes above. --- testsuites/ChangeLog | 6 ++++++ testsuites/aclocal/enable-tests.m4 | 14 ++++++-------- testsuites/configure.ac | 13 +++++++++---- 3 files changed, 21 insertions(+), 12 deletions(-) (limited to 'testsuites') diff --git a/testsuites/ChangeLog b/testsuites/ChangeLog index 5119653b53..fc78e2647c 100644 --- a/testsuites/ChangeLog +++ b/testsuites/ChangeLog @@ -1,3 +1,9 @@ +2003-08-22 Ralf Corsepius + + * aclocal/enable-tests.m4: Change to support + --enable-tests=no|yes|samples, default is samples. + * configure.ac: Reflect changes above. + 2003-08-18 Ralf Corsepius * Makefile.am: Reflect having moved aclocal/. diff --git a/testsuites/aclocal/enable-tests.m4 b/testsuites/aclocal/enable-tests.m4 index 027dc212c0..a535f8214b 100644 --- a/testsuites/aclocal/enable-tests.m4 +++ b/testsuites/aclocal/enable-tests.m4 @@ -2,14 +2,12 @@ dnl $Id$ AC_DEFUN(RTEMS_ENABLE_TESTS, [ -# If the tests are enabled, then find all the test suite Makefiles -AC_MSG_CHECKING([if the test suites are enabled? ]) AC_ARG_ENABLE(tests, -[AC_HELP_STRING([--enable-tests],[enable tests (default:disabled)])], +[AC_HELP_STRING([--enable-tests],[enable tests (default:samples)])], [case "${enableval}" in - yes) tests_enabled=yes ;; - no) tests_enabled=no ;; - *) AC_MSG_ERROR(bad value ${enableval} for tests option) ;; - esac], [tests_enabled=no]) -AC_MSG_RESULT([$tests_enabled]) + samples) enable_tests=samples;; + yes) enable_tests=yes ;; + no) enable_tests=no ;; + *) AC_MSG_ERROR([bad value ${enableval} for --enable-tests]) ;; + esac], [enable_tests=samples]) ]) diff --git a/testsuites/configure.ac b/testsuites/configure.ac index 4d5cf14bf1..dcb8b49276 100644 --- a/testsuites/configure.ac +++ b/testsuites/configure.ac @@ -29,12 +29,17 @@ 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 -AC_CONFIG_SUBDIRS(tools) -AC_CONFIG_SUBDIRS(support) -AC_CONFIG_SUBDIRS(samples) +case $enable_tests in +yes | samples ) + AC_CONFIG_SUBDIRS(tools) + AC_CONFIG_SUBDIRS(support) + AC_CONFIG_SUBDIRS(samples) + ;; +esac -if test "$tests_enabled" = "yes"; then +if test "$enable_tests" = "yes"; then # do functionality tests first, then performance tests AC_CONFIG_SUBDIRS(libtests sptests) if test "$HAS_MP" = "yes"; then -- cgit v1.2.3