diff --git a/testsuites/sptests/spcpuset01/init.c b/testsuites/sptests/spcpuset01/init.c index fa0e6a8d7c..138438fd68 100644 --- a/testsuites/sptests/spcpuset01/init.c +++ b/testsuites/sptests/spcpuset01/init.c @@ -11,10 +11,10 @@ #include #include #include - -#include #include "system.h" + +#if defined(__RTEMS_HAVE_SYS_CPUSET_H__) static void test_cpu_zero_case_1(void) { size_t i; @@ -153,3 +153,15 @@ rtems_task Init( puts( "*** END OF CPUSET01 Test ***" ); exit( 0 ); } +#else +#error "Init - No cpuset" +rtems_task Init( + rtems_task_argument ignored +) +{ + puts( "*** CPUSET01 Test ***" ); + puts( " cpuset not supported\n" ); + puts( "*** END OF CPUSET01 Test ***" ); + exit( 0 ); +} +#endif diff --git a/testsuites/sptests/spcpuset01/system.h b/testsuites/sptests/spcpuset01/system.h index cc3359fb15..0019abd95a 100644 --- a/testsuites/sptests/spcpuset01/system.h +++ b/testsuites/sptests/spcpuset01/system.h @@ -9,19 +9,23 @@ #include "tmacros.h" #include "test_support.h" + +#if defined(__RTEMS_HAVE_SYS_CPUSET_H__) + #include +/* global variables */ +extern cpu_set_t set1; +extern cpu_set_t set2; +extern cpu_set_t set3; +#endif + /* functions */ rtems_task Init( rtems_task_argument argument ); -/* global variables */ -extern cpu_set_t set1; -extern cpu_set_t set2; -extern cpu_set_t set3; - void cpuset_logic_test(void); /* configuration information */ diff --git a/testsuites/sptests/spcpuset01/test.c b/testsuites/sptests/spcpuset01/test.c index 3a595e3b4a..2691afff32 100644 --- a/testsuites/sptests/spcpuset01/test.c +++ b/testsuites/sptests/spcpuset01/test.c @@ -1,3 +1,7 @@ +#if HAVE_CONFIG_H +#include "config.h" +#endif + /* * Fully exercise CPU_SET() methods */ @@ -6,10 +10,9 @@ #include #include #include -#include #include "system.h" - +#if defined(__RTEMS_HAVE_SYS_CPUSET_H__) void test_cpu_and_case_1(size_t cpu1, size_t cpu2); void test_cpu_nand_case_1(size_t cpu1, size_t cpu2); void test_cpu_or_case_1(size_t cpu1, size_t cpu2); @@ -122,4 +125,4 @@ void cpuset_logic_test() } } } - +#endif