From b422aa3f4a8ecb27bc76c3c5f29d34e007564315 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Thu, 26 Apr 2018 16:05:45 +0200 Subject: tests: Remove configure feature checks Update #3409. --- testsuites/smptests/configure.ac | 23 +---------------------- testsuites/smptests/smppsxaffinity01/init.c | 14 -------------- testsuites/smptests/smppsxaffinity02/init.c | 14 -------------- 3 files changed, 1 insertion(+), 50 deletions(-) (limited to 'testsuites/smptests') diff --git a/testsuites/smptests/configure.ac b/testsuites/smptests/configure.ac index 937c5d4068..4668877e38 100644 --- a/testsuites/smptests/configure.ac +++ b/testsuites/smptests/configure.ac @@ -24,35 +24,14 @@ RTEMS_PROG_CC_FOR_TARGET RTEMS_PROG_CXX_FOR_TARGET RTEMS_CANONICALIZE_TOOLS -RTEMS_CHECK_CPUOPTS([RTEMS_POSIX_API]) - RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) -RTEMS_CHECK_CPUOPTS([RTEMS_MULTIPROCESSING]) -RTEMS_CHECK_CXX(RTEMS_BSP) -RTEMS_CHECK_CPUOPTS([RTEMS_NETWORKING]) +RTEMS_CHECK_CPUOPTS([RTEMS_POSIX_API]) RTEMS_CHECK_CPUOPTS([RTEMS_SMP]) AM_CONDITIONAL(NO_SMP,test "$rtems_cv_RTEMS_SMP" != "yes") AM_CONDITIONAL(HAS_SMP,test "$rtems_cv_RTEMS_SMP" = "yes") AM_CONDITIONAL([HAS_POSIX],[test x"${rtems_cv_RTEMS_POSIX_API}" = xyes]) -# These are SMP related and were added to newlib by RTEMS. -AC_CHECK_DECLS([pthread_attr_setaffinity_np],[],[],[[ - #define _GNU_SOURCE - #include ]]) -AC_CHECK_DECLS([pthread_attr_getaffinity_np],[],[],[[ - #define _GNU_SOURCE - #include ]]) -AC_CHECK_DECLS([pthread_setaffinity_np],[],[],[[ - #define _GNU_SOURCE - #include ]]) -AC_CHECK_DECLS([pthread_getaffinity_np],[],[],[[ - #define _GNU_SOURCE - #include ]]) -AC_CHECK_DECLS([pthread_getattr_np],[],[],[[ - #define _GNU_SOURCE - #include ]]) - # BSP Test configuration RTEMS_TEST_CHECK([smp01]) RTEMS_TEST_CHECK([smp02]) diff --git a/testsuites/smptests/smppsxaffinity01/init.c b/testsuites/smptests/smppsxaffinity01/init.c index 0ae6ee9f8f..56a0078b77 100644 --- a/testsuites/smptests/smppsxaffinity01/init.c +++ b/testsuites/smptests/smppsxaffinity01/init.c @@ -20,8 +20,6 @@ const char rtems_test_name[] = "SMPPSXAFFINITY 1"; -#if HAVE_DECL_PTHREAD_GETAFFINITY_NP - #define CPU_COUNT 4 pthread_t Init_id; @@ -151,18 +149,6 @@ void *POSIX_Init( rtems_test_exit(0); } -#else -void *POSIX_Init( - void *ignored -) -{ - TEST_BEGIN(); - puts( " POSIX Affinity Methods NOT Supported"); - TEST_END(); - rtems_test_exit(0); -} - -#endif /* configuration information */ #define CONFIGURE_APPLICATION_NEEDS_SIMPLE_CONSOLE_DRIVER diff --git a/testsuites/smptests/smppsxaffinity02/init.c b/testsuites/smptests/smppsxaffinity02/init.c index 12f91124b3..d196621950 100644 --- a/testsuites/smptests/smppsxaffinity02/init.c +++ b/testsuites/smptests/smppsxaffinity02/init.c @@ -22,8 +22,6 @@ const char rtems_test_name[] = "SMPPSXAFFINITY 2"; -#if HAVE_DECL_PTHREAD_GETAFFINITY_NP - pthread_t Init_id; pthread_t Med_id[NUM_CPUS-1]; pthread_t Low_id[NUM_CPUS]; @@ -217,18 +215,6 @@ void *POSIX_Init( rtems_test_exit(0); } -#else -void *POSIX_Init( - void *ignored -) -{ - TEST_BEGIN(); - puts( " Affinity NOT Supported"); - TEST_END(); - rtems_test_exit(0); -} - -#endif /* configuration information */ #define CONFIGURE_APPLICATION_NEEDS_SIMPLE_CONSOLE_DRIVER -- cgit v1.2.3