rusefi
/
ChibiOS
mirror of https://github.com/rusefi/ChibiOS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Test-related fixes. 

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@13244 27425a3e-05d8-49a3-a47f-9c15f0e5edd8
This commit is contained in:
Giovanni Di Sirio 2019-12-31 15:11:37 +00:00
parent 7c7ce454e3
commit af4c60a3ef
13 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
demos/SPC5/NIL-SPC560D-EVB/chconf.h
View File

@ -48,7 +48,7 @@
* (0..CH_CFG_MAX_THREADS-1). * (0..CH_CFG_MAX_THREADS-1).
*/ */
#if !defined(CH_CFG_MAX_THREADS) #if !defined(CH_CFG_MAX_THREADS)
#define CH_CFG_MAX_THREADS 4 #define CH_CFG_MAX_THREADS 8
#endif #endif
/** /**

2
demos/SPC5/NIL-SPC560D-EVB/main.c
View File

@ -123,7 +123,7 @@ THD_FUNCTION(Thread2, arg) {
*/ */
THD_TABLE_BEGIN THD_TABLE_BEGIN
THD_TABLE_THREAD(0, "blinker", waThread1, Thread1, NULL) THD_TABLE_THREAD(0, "blinker", waThread1, Thread1, NULL)
THD_TABLE_THREAD(2, "tester", waThread2, Thread2, NULL) THD_TABLE_THREAD(4, "tester", waThread2, Thread2, NULL)
THD_TABLE_END THD_TABLE_END
/* /*

2
demos/STM32/NIL-STM32F051-DISCOVERY/cfg/chconf.h
View File

@ -48,7 +48,7 @@
* (0..CH_CFG_MAX_THREADS-1). * (0..CH_CFG_MAX_THREADS-1).
*/ */
#if !defined(CH_CFG_MAX_THREADS) #if !defined(CH_CFG_MAX_THREADS)
#define CH_CFG_MAX_THREADS 5 #define CH_CFG_MAX_THREADS 8
#endif #endif
/** /**

2
demos/STM32/NIL-STM32F051-DISCOVERY/main.c
View File

@ -86,7 +86,7 @@ THD_FUNCTION(Thread3, arg) {
THD_TABLE_BEGIN THD_TABLE_BEGIN
THD_TABLE_THREAD(0, "blinker1", waThread1, Thread1, NULL) THD_TABLE_THREAD(0, "blinker1", waThread1, Thread1, NULL)
THD_TABLE_THREAD(1, "blinker2", waThread2, Thread2, NULL) THD_TABLE_THREAD(1, "blinker2", waThread2, Thread2, NULL)
THD_TABLE_THREAD(3, "tester", waThread3, Thread3, NULL) THD_TABLE_THREAD(4, "tester", waThread3, Thread3, NULL)
THD_TABLE_END THD_TABLE_END
/* /*

2
demos/STM32/NIL-STM32F303-DISCOVERY/cfg/chconf.h
View File

@ -48,7 +48,7 @@
* (0..CH_CFG_MAX_THREADS-1). * (0..CH_CFG_MAX_THREADS-1).
*/ */
#if !defined(CH_CFG_MAX_THREADS) #if !defined(CH_CFG_MAX_THREADS)
#define CH_CFG_MAX_THREADS 5 #define CH_CFG_MAX_THREADS 8
#endif #endif
/** /**

2
demos/STM32/NIL-STM32F303-DISCOVERY/main.c
View File

@ -110,7 +110,7 @@ THD_FUNCTION(Thread3, arg) {
THD_TABLE_BEGIN THD_TABLE_BEGIN
THD_TABLE_THREAD(0, "blinker1", waThread1, Thread1, NULL) THD_TABLE_THREAD(0, "blinker1", waThread1, Thread1, NULL)
THD_TABLE_THREAD(1, "blinker2", waThread2, Thread2, NULL) THD_TABLE_THREAD(1, "blinker2", waThread2, Thread2, NULL)
THD_TABLE_THREAD(3, "tester", waThread3, Thread3, NULL) THD_TABLE_THREAD(4, "tester", waThread3, Thread3, NULL)
THD_TABLE_END THD_TABLE_END
/* /*

10
demos/STM32/NIL-STM32F746G-DISCOVERY/cfg/chconf.h
View File

@ -48,7 +48,7 @@
* (0..CH_CFG_MAX_THREADS-1). * (0..CH_CFG_MAX_THREADS-1).
*/ */
#if !defined(CH_CFG_MAX_THREADS) #if !defined(CH_CFG_MAX_THREADS)
#define CH_CFG_MAX_THREADS 4 #define CH_CFG_MAX_THREADS 8
#endif #endif
/** /**
@ -379,7 +379,7 @@
* @note The default is @p FALSE. * @note The default is @p FALSE.
*/ */
#if !defined(CH_DBG_SYSTEM_STATE_CHECK) #if !defined(CH_DBG_SYSTEM_STATE_CHECK)
#define CH_DBG_SYSTEM_STATE_CHECK TRUE #define CH_DBG_SYSTEM_STATE_CHECK FALSE
#endif #endif
/** /**
@ -388,7 +388,7 @@
* @note The default is @p FALSE. * @note The default is @p FALSE.
*/ */
#if !defined(CH_DBG_ENABLE_CHECKS) #if !defined(CH_DBG_ENABLE_CHECKS)
#define CH_DBG_ENABLE_CHECKS TRUE #define CH_DBG_ENABLE_CHECKS FALSE
#endif #endif
/** /**
@ -397,7 +397,7 @@
* @note The default is @p FALSE. * @note The default is @p FALSE.
*/ */
#if !defined(CH_DBG_ENABLE_ASSERTS) #if !defined(CH_DBG_ENABLE_ASSERTS)
#define CH_DBG_ENABLE_ASSERTS TRUE #define CH_DBG_ENABLE_ASSERTS FALSE
#endif #endif
/** /**
@ -406,7 +406,7 @@
* @note The default is @p FALSE. * @note The default is @p FALSE.
*/ */
#if !defined(CH_DBG_ENABLE_STACK_CHECK) #if !defined(CH_DBG_ENABLE_STACK_CHECK)
#define CH_DBG_ENABLE_STACK_CHECK TRUE #define CH_DBG_ENABLE_STACK_CHECK FALSE
#endif #endif
/** @} */ /** @} */

2
demos/STM32/NIL-STM32F746G-DISCOVERY/main.c
View File

@ -72,7 +72,7 @@ THD_FUNCTION(Thread2, arg) {
*/ */
THD_TABLE_BEGIN THD_TABLE_BEGIN
THD_TABLE_THREAD(0, "blinker1", waThread1, Thread1, NULL) THD_TABLE_THREAD(0, "blinker1", waThread1, Thread1, NULL)
THD_TABLE_THREAD(2, "tester", waThread2, Thread2, NULL) THD_TABLE_THREAD(4, "tester", waThread2, Thread2, NULL)
THD_TABLE_END THD_TABLE_END
/* /*

2
demos/STM32/NIL-STM32L476-DISCOVERY/cfg/chconf.h
View File

@ -48,7 +48,7 @@
* (0..CH_CFG_MAX_THREADS-1). * (0..CH_CFG_MAX_THREADS-1).
*/ */
#if !defined(CH_CFG_MAX_THREADS) #if !defined(CH_CFG_MAX_THREADS)
#define CH_CFG_MAX_THREADS 5 #define CH_CFG_MAX_THREADS 8
#endif #endif
/** /**

2
demos/STM32/NIL-STM32L476-DISCOVERY/main.c
View File

@ -83,7 +83,7 @@ THD_FUNCTION(Thread3, arg) {
THD_TABLE_BEGIN THD_TABLE_BEGIN
THD_TABLE_THREAD(0, "blinker1", waThread1, Thread1, NULL) THD_TABLE_THREAD(0, "blinker1", waThread1, Thread1, NULL)
THD_TABLE_THREAD(1, "blinker2", waThread2, Thread2, NULL) THD_TABLE_THREAD(1, "blinker2", waThread2, Thread2, NULL)
THD_TABLE_THREAD(3, "tester", waThread3, Thread3, NULL) THD_TABLE_THREAD(4, "tester", waThread3, Thread3, NULL)
THD_TABLE_END THD_TABLE_END
/* /*

2
os/nil/src/ch.c
View File

@ -775,7 +775,7 @@ thread_t *chThdCreateI(const thread_descriptor_t *tdp) {
tp->epmask = (eventmask_t)0; tp->epmask = (eventmask_t)0;
#endif #endif
#if CH_DBG_ENABLE_STACK_CHECK == TRUE #if CH_DBG_ENABLE_STACK_CHECK == TRUE
tp->wabase = (stkalign_t *)tcp->wbase; tp->wabase = (stkalign_t *)tdp->wbase;
#endif #endif
/* Port dependent thread initialization.*/ /* Port dependent thread initialization.*/

2
test/oslib/configuration.xml
View File

@ -1120,7 +1120,7 @@ thread_descriptor_t td2 = {
.name = "dispatcher2", .name = "dispatcher2",
.wbase = wa2Thread1, .wbase = wa2Thread1,
.wend = THD_WORKING_AREA_END(wa2Thread1), .wend = THD_WORKING_AREA_END(wa2Thread1),
.prio = chThdGetPriorityX() - 1, .prio = chThdGetPriorityX() - 2,
.funcp = Thread1, .funcp = Thread1,
.arg = NULL .arg = NULL
}; };

6
test/oslib/source/test/oslib_test_sequence_004.c
View File

@ -84,7 +84,7 @@ static THD_FUNCTION(Thread1, arg) {
* - [4.1.1] Initializing the Jobs Queue object. * - [4.1.1] Initializing the Jobs Queue object.
* - [4.1.2] Starting the dispatcher threads. * - [4.1.2] Starting the dispatcher threads.
* - [4.1.3] Sending jobs with various timings. * - [4.1.3] Sending jobs with various timings.
* - [4.1.4] Sending null jobs to make threads exit. * - [4.1.4] Sending two null jobs to make threads exit.
* . * .
*/ */
@ -115,7 +115,7 @@ static void oslib_test_004_001_execute(void) {
.name = "dispatcher2", .name = "dispatcher2",
.wbase = wa2Thread1, .wbase = wa2Thread1,
.wend = THD_WORKING_AREA_END(wa2Thread1), .wend = THD_WORKING_AREA_END(wa2Thread1),
.prio = chThdGetPriorityX() - 1, .prio = chThdGetPriorityX() - 2,
.funcp = Thread1, .funcp = Thread1,
.arg = NULL .arg = NULL
}; };
@ -138,7 +138,7 @@ static void oslib_test_004_001_execute(void) {
} }
test_end_step(3); test_end_step(3);
/* [4.1.4] Sending null jobs to make threads exit.*/ /* [4.1.4] Sending two null jobs to make threads exit.*/
test_set_step(4); test_set_step(4);
{ {
job_descriptor_t *jdp; job_descriptor_t *jdp;