diff --git a/configure.ac b/configure.ac index 009f73591..55fc2039d 100644 --- a/configure.ac +++ b/configure.ac @@ -66,8 +66,35 @@ AC_CHECK_HEADERS([ \ AC_CONFIG_SUBDIRS([ \ testcases/kernel/syscalls/libevent \ +]) + +AC_ARG_WITH([open-posix-testsuite], + [AC_HELP_STRING([--with-open-posix-testsuite], + [compile and install the open posix testsuite (default=no)])], + [with_open_posix_testsuite=yes] +) +if test "x$with_open_posix_testsuite" = xyes; then + AC_SUBST([WITH_OPEN_POSIX_TESTSUITE],["yes"]) +else + AC_SUBST([WITH_OPEN_POSIX_TESTSUITE],["no"]) +fi + +AC_ARG_WITH([realtime-testsuite], + [AC_HELP_STRING([--with-realtime-testsuite], + [compile and install the realtime testsuite (default=no)])], + [with_realtime_testsuite=yes] +) +if test "x$with_realtime_testsuite" = xyes; then + AC_SUBST([WITH_REALTIME_TESTSUITE],["yes"]) +else + AC_SUBST([WITH_REALTIME_TESTSUITE],["no"]) +fi + +if test "x$with_realtime_testsuite" = xyes; then +AC_CONFIG_SUBDIRS([ \ testcases/realtime \ ]) +fi LTP_CHECK_CAPABILITY_SUPPORT LTP_CHECK_CRYPTO diff --git a/include/mk/features.mk.default b/include/mk/features.mk.default index 9fa183f99..8ee16ff58 100644 --- a/include/mk/features.mk.default +++ b/include/mk/features.mk.default @@ -21,7 +21,17 @@ # # Path to capset program -CAPSET := +CAPSET := # Is securebits[.h], et all support available? -HAVE_SECUREBITS := no +HAVE_SECUREBITS := no + +# Enable testcases/open_posix_testsuite's compile and install? +WITH_OPEN_POSIX_TESTSUITE := no + +# Enable testcases/realtime's compile and install? +ifeq ($(UCLINUX),1) +WITH_REALTIME_TESTSUITE := no +else +WITH_REALTIME_TESTSUITE := no +endif diff --git a/include/mk/features.mk.in b/include/mk/features.mk.in index ee9f06e34..958848e86 100644 --- a/include/mk/features.mk.in +++ b/include/mk/features.mk.in @@ -21,7 +21,17 @@ # # Path to capset program -CAPSET := @CAPSET@ +CAPSET := @CAPSET@ # Is securebits[.h], et all support available? -HAVE_SECUREBITS := @HAVE_SECUREBITS@ +HAVE_SECUREBITS := @HAVE_SECUREBITS@ + +# Enable testcases/open_posix_testsuite's compile and install? +WITH_OPEN_POSIX_TESTSUITE := @WITH_OPEN_POSIX_TESTSUITE@ + +# Enable testcases/realtime's compile and install? +ifeq ($(UCLINUX),1) +WITH_REALTIME_TESTSUITE := no +else +WITH_REALTIME_TESTSUITE := @WITH_REALTIME_TESTSUITE@ +endif diff --git a/testcases/Makefile b/testcases/Makefile index 5087ed526..048a33e62 100644 --- a/testcases/Makefile +++ b/testcases/Makefile @@ -30,14 +30,10 @@ include $(top_srcdir)/include/mk/env_pre.mk # WILL crash the build host (the tests need to be fixed to just build, not # run). # 3. mce-test doesn't fit cleanly in the build, yet. -# 4. pounder21 is just broken. +# 4. pounder21 isn't supposed to fit in the build. FILTER_OUT_DIRS := ballista kdump mce-test open% pounder21 -# XXX (garrcoop): Not sure why realtime is still in this list; this was the -# original list of disabled items... -# XXX (garrcoop): kdump was in this list. -# XXX (garrcoop): open_hpi_testsuite was in this list. -ifeq ($(UCLINUX),1) +ifneq ($(WITH_REALTIME_TESTSUITE),yes) FILTER_OUT_DIRS += realtime endif