diff options
-rw-r--r-- | testsuites/tmtests/ChangeLog | 6 | ||||
-rw-r--r-- | testsuites/tmtests/tm26/task1.c | 9 | ||||
-rw-r--r-- | testsuites/tmtests/tm27/task1.c | 2 |
3 files changed, 17 insertions, 0 deletions
diff --git a/testsuites/tmtests/ChangeLog b/testsuites/tmtests/ChangeLog index e7d4509392..ba6d8245e2 100644 --- a/testsuites/tmtests/ChangeLog +++ b/testsuites/tmtests/ChangeLog @@ -1,3 +1,9 @@ +2004-02-26 Joel Sherrill <joel@OARcorp.com> + + PR 583/tests + * tm26/task1.c, tm27/task1.c: Correctly reset + _Thread_Dispatch_disable_level so printing is safe. + 2004-01-14 Ralf Corsepius <corsepiu@faw.uni-ulm.de> * tm01/Makefile.am: Re-add dirstamps to PRE/TMPINSTALL_FILES. diff --git a/testsuites/tmtests/tm26/task1.c b/testsuites/tmtests/tm26/task1.c index 6db80632f8..299fa67ddc 100644 --- a/testsuites/tmtests/tm26/task1.c +++ b/testsuites/tmtests/tm26/task1.c @@ -418,6 +418,15 @@ void complete_test( void ) thread_get_invalid_time = Read_timer(); /* + * This is the running task and we have tricked RTEMS out enough where + * we need to set some internal tracking information to match this. + */ + + _Thread_Heir = _Thread_Executing; + _Context_Switch_necessary = FALSE; + _Thread_Dispatch_disable_level = 0; + + /* * Now dump all the times */ diff --git a/testsuites/tmtests/tm27/task1.c b/testsuites/tmtests/tm27/task1.c index 18ea62a162..16b49742c9 100644 --- a/testsuites/tmtests/tm27/task1.c +++ b/testsuites/tmtests/tm27/task1.c @@ -144,6 +144,8 @@ rtems_task Task_1( #endif Interrupt_return_time = Read_timer(); + _Thread_Dispatch_disable_level = 0; + put_time( "interrupt entry overhead: returns to nested interrupt", Interrupt_enter_nested_time, |