diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2007-03-28 18:15:21 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2007-03-28 18:15:21 +0000 |
| commit | 81b291532cd54bd126d96d5246ca4d0c07c6426e (patch) | |
| tree | a9e6283eeac568e2206c5df19ece5e0af0bad754 /testsuites/mptests | |
| parent | 2007-03-28 Joel Sherrill <joel@OARcorp.com> (diff) | |
| download | rtems-81b291532cd54bd126d96d5246ca4d0c07c6426e.tar.bz2 | |
2007-03-28 Joel Sherrill <joel@OARcorp.com>
* mp12/node2/mp12-node2.scn: Redo screen to not have cvs conflict
marker.
Diffstat (limited to 'testsuites/mptests')
| -rw-r--r-- | testsuites/mptests/ChangeLog | 5 | ||||
| -rw-r--r-- | testsuites/mptests/mp12/node2/mp12-node2.scn | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/testsuites/mptests/ChangeLog b/testsuites/mptests/ChangeLog index 39ce3d8ca5..71560e2ac1 100644 --- a/testsuites/mptests/ChangeLog +++ b/testsuites/mptests/ChangeLog @@ -1,3 +1,8 @@ +2007-03-28 Joel Sherrill <joel@OARcorp.com> + + * mp12/node2/mp12-node2.scn: Redo screen to not have cvs conflict + marker. + 2006-12-02 Ralf Corsépius <ralf.corsepius@rtems.org> * configure.ac: New BUG-REPORT address. diff --git a/testsuites/mptests/mp12/node2/mp12-node2.scn b/testsuites/mptests/mp12/node2/mp12-node2.scn index ad65e9cb32..c0f85df6cb 100644 --- a/testsuites/mptests/mp12/node2/mp12-node2.scn +++ b/testsuites/mptests/mp12/node2/mp12-node2.scn @@ -4,7 +4,7 @@ Getting ID of remote Partition (Global) Attempting to delete remote Partition (Global) rtems_partition_delete correctly returned RTEMS_ILLEGAL_ON_REMOTE_OBJECT Obtaining a buffer from the global partition ->>>>>>> address returned will differ +------> address returned will differ Address returned was : 0x200f0000 Releasing a buffer to the global partition *** END OF TEST 12 *** |