diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2019-11-06 16:23:28 +0100 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2019-11-12 09:36:20 +0100 |
| commit | eae263c609a3c62af8a0cd9aae240ed6394780aa (patch) | |
| tree | 9c93506604fcbef910d1084fd5477c356bbf3f17 | |
| parent | tmtests: Avoid build system defined defines (diff) | |
| download | rtems-eae263c609a3c62af8a0cd9aae240ed6394780aa.tar.bz2 | |
mptests/mp14: Make MAX_LONG_TEST_DURATION constant
If there is a real need, it can be made a configuration option again.
Update #3818.
| -rw-r--r-- | testsuites/mptests/Makefile.am | 4 | ||||
| -rw-r--r-- | testsuites/mptests/configure.ac | 4 | ||||
| -rw-r--r-- | testsuites/mptests/mp14/init.c | 6 |
3 files changed, 8 insertions, 6 deletions
diff --git a/testsuites/mptests/Makefile.am b/testsuites/mptests/Makefile.am index 7111e2d109..6ddb2e80cc 100644 --- a/testsuites/mptests/Makefile.am +++ b/testsuites/mptests/Makefile.am @@ -231,7 +231,7 @@ mp14_node1_SOURCES = mp14/init.c mp14/exit.c mp14/delay.c \ mp14/evtask1.c mp14/evtmtask.c mp14/pttask1.c mp14/smtask1.c \ mp14/msgtask1.c mp14/system.h mp14_node1_CPPFLAGS = -DNODE_NUMBER=1 $(AM_CPPFLAGS) $(TEST_FLAGS_mp14) \ - $(support_includes) -DMAX_LONG_TEST_DURATION=$(MAX_LONG_TEST_DURATION) + $(support_includes) mp_tests += mp14_node2 mp_screens += mp14/mp14-node2.scn mp_docs += mp14/mp14-node2.doc @@ -239,7 +239,7 @@ mp14_node2_SOURCES = mp14/init.c mp14/exit.c mp14/delay.c \ mp14/evtask1.c mp14/evtmtask.c mp14/pttask1.c mp14/smtask1.c \ mp14/msgtask1.c mp14/system.h mp14_node2_CPPFLAGS = -DNODE_NUMBER=2 $(AM_CPPFLAGS) $(TEST_FLAGS_mp14) \ - $(support_includes) -DMAX_LONG_TEST_DURATION=$(MAX_LONG_TEST_DURATION) + $(support_includes) endif endif diff --git a/testsuites/mptests/configure.ac b/testsuites/mptests/configure.ac index 134d6215d3..bf14579442 100644 --- a/testsuites/mptests/configure.ac +++ b/testsuites/mptests/configure.ac @@ -28,10 +28,6 @@ RTEMS_CHECK_CPUOPTS([RTEMS_MULTIPROCESSING]) 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], -[The longest length of time a "long running" test should run]) - # BSP Test configuration RTEMS_TEST_CHECK([mp01]) RTEMS_TEST_CHECK([mp03]) diff --git a/testsuites/mptests/mp14/init.c b/testsuites/mptests/mp14/init.c index 68359bcd3a..3591e271f8 100644 --- a/testsuites/mptests/mp14/init.c +++ b/testsuites/mptests/mp14/init.c @@ -26,6 +26,12 @@ #define CONFIGURE_INIT #include "system.h" +/* + * This used to be a configuration option. If there is a real need, it can be + * made a configuration option again. + */ +#define MAX_LONG_TEST_DURATION 100 + uint8_t my_partition[0x30000] CPU_STRUCTURE_ALIGNMENT; static rtems_timer_service_routine Stop_Test_TSR( |