summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2002-11-14 17:36:14 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2002-11-14 17:36:14 +0000
commitafcd56350bed45fcf0b7afd777dc5d054d577af7 (patch)
tree8ca676e29ed7d318dc7f4db4c9a0d1f4b22a5eb8
parent2002-11-14 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff)
downloadrtems-afcd56350bed45fcf0b7afd777dc5d054d577af7.tar.bz2
2002-11-14 Joel Sherrill <joel@OARcorp.com>
* sp02/sp02.scn, sp15/sp15.scn, sp16/sp16.scn, sp20/sp20.scn, sp22/sp22.scn, sp23/sp23.scn, sp25/sp25.scn, sp31/sp31.scn: Per PR239 update the IDs in the screens.
Diffstat (limited to '')
-rw-r--r--c/src/tests/sptests/ChangeLog6
-rw-r--r--c/src/tests/sptests/sp02/sp02.scn4
-rw-r--r--c/src/tests/sptests/sp15/sp15.scn4
-rw-r--r--c/src/tests/sptests/sp16/sp16.scn2
-rw-r--r--c/src/tests/sptests/sp20/sp20.scn24
-rw-r--r--c/src/tests/sptests/sp22/sp22.scn4
-rw-r--r--c/src/tests/sptests/sp23/sp23.scn2
-rw-r--r--c/src/tests/sptests/sp25/sp25.scn2
-rw-r--r--c/src/tests/sptests/sp31/sp31.scn8
-rw-r--r--testsuites/sptests/ChangeLog6
-rw-r--r--testsuites/sptests/sp02/sp02.scn4
-rw-r--r--testsuites/sptests/sp15/sp15.scn4
-rw-r--r--testsuites/sptests/sp16/sp16.scn2
-rw-r--r--testsuites/sptests/sp20/sp20.scn24
-rw-r--r--testsuites/sptests/sp22/sp22.scn4
-rw-r--r--testsuites/sptests/sp23/sp23.scn2
-rw-r--r--testsuites/sptests/sp25/sp25.scn2
-rw-r--r--testsuites/sptests/sp31/sp31.scn8
18 files changed, 62 insertions, 50 deletions
diff --git a/c/src/tests/sptests/ChangeLog b/c/src/tests/sptests/ChangeLog
index a7f7fc7d98..ecaa899486 100644
--- a/c/src/tests/sptests/ChangeLog
+++ b/c/src/tests/sptests/ChangeLog
@@ -1,3 +1,9 @@
+2002-11-14 Joel Sherrill <joel@OARcorp.com>
+
+ * sp02/sp02.scn, sp15/sp15.scn, sp16/sp16.scn, sp20/sp20.scn,
+ sp22/sp22.scn, sp23/sp23.scn, sp25/sp25.scn, sp31/sp31.scn: Per PR239
+ update the IDs in the screens.
+
2002-10-21 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* .cvsignore: Reformat.
diff --git a/c/src/tests/sptests/sp02/sp02.scn b/c/src/tests/sptests/sp02/sp02.scn
index d3f3d61cd1..01f22f6a19 100644
--- a/c/src/tests/sptests/sp02/sp02.scn
+++ b/c/src/tests/sptests/sp02/sp02.scn
@@ -5,8 +5,8 @@ INIT - suspending TA2 while middle task on a ready chain
TA1 - rtems_task_wake_after - sleep 1 second
TA2 - rtems_task_wake_after - sleep 1 minute
TA3 - rtems_task_wake_after - sleep 5 seconds
-TA1 - rtems_task_ident - tid of TA2 (0x08010007)
-TA1 - rtems_task_ident - tid of TA3 (0x08010008)
+TA1 - rtems_task_ident - tid of TA2 (0x0a010004)
+TA1 - rtems_task_ident - tid of TA3 (0x0a010002)
TA1 - rtems_task_set_priority - set TA3's priority to 2
TA1 - rtems_task_suspend - suspend TA2
TA1 - rtems_task_delete - delete TA2
diff --git a/c/src/tests/sptests/sp15/sp15.scn b/c/src/tests/sptests/sp15/sp15.scn
index 95480fa89f..9cc7f1d200 100644
--- a/c/src/tests/sptests/sp15/sp15.scn
+++ b/c/src/tests/sptests/sp15/sp15.scn
@@ -1,8 +1,8 @@
*** TEST 15 ***
INIT - rtems_partition_create - partition 1
INIT - rtems_partition_create - partition 2
-TA1 - rtems_partition_ident - partition 1 id = 20010001
-TA1 - rtems_partition_ident - partition 2 id = 20010002
+TA1 - rtems_partition_ident - partition 1 id = 2a010001
+TA1 - rtems_partition_ident - partition 2 id = 2a010002
TA1 - rtems_partition_get_buffer - buffer 1 from partition 1 - 0x00000000
TA1 - rtems_partition_get_buffer - buffer 2 from partition 1 - 0x00000200
TA1 - rtems_partition_get_buffer - buffer 1 from partition 2 - 0x00000000
diff --git a/c/src/tests/sptests/sp16/sp16.scn b/c/src/tests/sptests/sp16/sp16.scn
index 660e9fe352..113d08f567 100644
--- a/c/src/tests/sptests/sp16/sp16.scn
+++ b/c/src/tests/sptests/sp16/sp16.scn
@@ -1,5 +1,5 @@
*** TEST 16 ***
-TA1 - rtems_region_ident - rnid => 24010002
+TA1 - rtems_region_ident - rnid => 32010002
TA1 - rtems_region_get_segment - wait on 100 byte segment from region 2
TA1 - got segment from region 2 - 0x00000f78
TA1 - rtems_region_get_segment - wait on 3K segment from region 3
diff --git a/c/src/tests/sptests/sp20/sp20.scn b/c/src/tests/sptests/sp20/sp20.scn
index 477a3a2dac..d0726f7e07 100644
--- a/c/src/tests/sptests/sp20/sp20.scn
+++ b/c/src/tests/sptests/sp20/sp20.scn
@@ -1,21 +1,21 @@
*** TEST 20 ***
-TA1 - rtems_rate_monotonic_create id = 0x2c010001
-TA1 - rtems_rate_monotonic_ident id = 0x2c010001
+TA1 - rtems_rate_monotonic_create id = 0x42010001
+TA1 - rtems_rate_monotonic_ident id = 0x42010001
TA1 - (0x2c010001) period 2
-TA2 - rtems_rate_monotonic_create id = 0x2c010002
-TA2 - rtems_rate_monotonic_ident id = 0x2c010002
+TA2 - rtems_rate_monotonic_create id = 0x42010002
+TA2 - rtems_rate_monotonic_ident id = 0x42010002
TA2 - (0x2c010002) period 2
-TA3 - rtems_rate_monotonic_create id = 0x2c010003
-TA3 - rtems_rate_monotonic_ident id = 0x2c010003
+TA3 - rtems_rate_monotonic_create id = 0x42010003
+TA3 - rtems_rate_monotonic_ident id = 0x42010003
TA3 - (0x2c010003) period 2
-TA4 - rtems_rate_monotonic_create id = 0x2c010004
-TA4 - rtems_rate_monotonic_ident id = 0x2c010004
+TA4 - rtems_rate_monotonic_create id = 0x42010004
+TA4 - rtems_rate_monotonic_ident id = 0x42010004
TA4 - (0x2c010004) period 2
-TA5 - rtems_rate_monotonic_create id = 0x2c010005
-TA5 - rtems_rate_monotonic_ident id = 0x2c010005
+TA5 - rtems_rate_monotonic_create id = 0x42010005
+TA5 - rtems_rate_monotonic_ident id = 0x42010005
TA5 - (0x2c010005) period 100
-TA6 - rtems_rate_monotonic_create id = 0x2c010006
-TA6 - rtems_rate_monotonic_ident id = 0x2c010006
+TA6 - rtems_rate_monotonic_create id = 0x42010006
+TA6 - rtems_rate_monotonic_ident id = 0x42010006
TA6 - (0x2c010006) period 0
TA5 - PERIODS CHECK OK (1)
TA5 - PERIODS CHECK OK (2)
diff --git a/c/src/tests/sptests/sp22/sp22.scn b/c/src/tests/sptests/sp22/sp22.scn
index c95e45a73a..c58b107f06 100644
--- a/c/src/tests/sptests/sp22/sp22.scn
+++ b/c/src/tests/sptests/sp22/sp22.scn
@@ -1,8 +1,8 @@
*** TEST 22 ***
INIT - rtems_timer_create - creating timer 1
-INIT - timer 1 has id (0x14010001)
+INIT - timer 1 has id (0x12010001)
TA1 - rtems_timer_ident - identing timer 1
-TA1 - timer 1 has id (0x14010001)
+TA1 - timer 1 has id (0x12010001)
TA1 - rtems_clock_get - 09:00:00 12/31/1988
TA1 - rtems_timer_fire_after - timer 1 in 3 seconds
TA1 - rtems_task_suspend( RTEMS_SELF )
diff --git a/c/src/tests/sptests/sp23/sp23.scn b/c/src/tests/sptests/sp23/sp23.scn
index 8aef169c56..0044ce7657 100644
--- a/c/src/tests/sptests/sp23/sp23.scn
+++ b/c/src/tests/sptests/sp23/sp23.scn
@@ -1,6 +1,6 @@
*** TEST 23 ***
INIT - rtems_port_create - DP1 - int = 0x1000 ext = 0x2000
-TA1 - rtems_port_ident - 0x28010001
+TA1 - rtems_port_ident - 0x3a010001
TA1 - rtems_port_external_to_internal - 0x200e => 0x100e
TA1 - rtems_port_internal_to_external - 0x100e => 0x200e
TA1 - rtems_port_external_to_internal - 0x300e => 0x300e
diff --git a/c/src/tests/sptests/sp25/sp25.scn b/c/src/tests/sptests/sp25/sp25.scn
index d15cc46897..85ec899f43 100644
--- a/c/src/tests/sptests/sp25/sp25.scn
+++ b/c/src/tests/sptests/sp25/sp25.scn
@@ -2,7 +2,7 @@ NOTE: Addresses vary between BSPs. Please check that the addresses
printed are reasonable for your target board and that the
segments noted as being returned were allocated from the region.
*** TEST 25 ***
-TA1 - rtems_region_ident - 0x24010002
+TA1 - rtems_region_ident - 0x32010002
TA1 - rtems_region_get_segment - wait on 64 byte segment from region 1
TA1 - got segment from region 1 - 0xXXXXXXXX
TA1 - rtems_region_get_segment - wait on 128 byte segment from region 1
diff --git a/c/src/tests/sptests/sp31/sp31.scn b/c/src/tests/sptests/sp31/sp31.scn
index 9f94652602..afb11f9d27 100644
--- a/c/src/tests/sptests/sp31/sp31.scn
+++ b/c/src/tests/sptests/sp31/sp31.scn
@@ -1,12 +1,12 @@
*** TEST 31 ***
INIT - rtems_timer_create - creating timer 1
-INIT - timer 1 has id (0x14010001)
+INIT - timer 1 has id (0x12010001)
INIT - rtems_timer_create - creating timer 2
-INIT - timer 2 has id (0x14010002)
+INIT - timer 2 has id (0x12010002)
TA1 - rtems_timer_ident - identing timer 1
-TA1 - timer 1 has id (0x14010001)
+TA1 - timer 1 has id (0x12010001)
TA1 - rtems_timer_ident - identing timer 2
-TA1 - timer 2 has id (0x14010002)
+TA1 - timer 2 has id (0x12010002)
TA1 - rtems_timer_server_fire_after - 1 second
TA1 - rtems_task_wake_after - 1/2 second
TA1 - rtems_timer_server_fire_after - timer 2 in 1/2 second
diff --git a/testsuites/sptests/ChangeLog b/testsuites/sptests/ChangeLog
index a7f7fc7d98..ecaa899486 100644
--- a/testsuites/sptests/ChangeLog
+++ b/testsuites/sptests/ChangeLog
@@ -1,3 +1,9 @@
+2002-11-14 Joel Sherrill <joel@OARcorp.com>
+
+ * sp02/sp02.scn, sp15/sp15.scn, sp16/sp16.scn, sp20/sp20.scn,
+ sp22/sp22.scn, sp23/sp23.scn, sp25/sp25.scn, sp31/sp31.scn: Per PR239
+ update the IDs in the screens.
+
2002-10-21 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* .cvsignore: Reformat.
diff --git a/testsuites/sptests/sp02/sp02.scn b/testsuites/sptests/sp02/sp02.scn
index d3f3d61cd1..01f22f6a19 100644
--- a/testsuites/sptests/sp02/sp02.scn
+++ b/testsuites/sptests/sp02/sp02.scn
@@ -5,8 +5,8 @@ INIT - suspending TA2 while middle task on a ready chain
TA1 - rtems_task_wake_after - sleep 1 second
TA2 - rtems_task_wake_after - sleep 1 minute
TA3 - rtems_task_wake_after - sleep 5 seconds
-TA1 - rtems_task_ident - tid of TA2 (0x08010007)
-TA1 - rtems_task_ident - tid of TA3 (0x08010008)
+TA1 - rtems_task_ident - tid of TA2 (0x0a010004)
+TA1 - rtems_task_ident - tid of TA3 (0x0a010002)
TA1 - rtems_task_set_priority - set TA3's priority to 2
TA1 - rtems_task_suspend - suspend TA2
TA1 - rtems_task_delete - delete TA2
diff --git a/testsuites/sptests/sp15/sp15.scn b/testsuites/sptests/sp15/sp15.scn
index 95480fa89f..9cc7f1d200 100644
--- a/testsuites/sptests/sp15/sp15.scn
+++ b/testsuites/sptests/sp15/sp15.scn
@@ -1,8 +1,8 @@
*** TEST 15 ***
INIT - rtems_partition_create - partition 1
INIT - rtems_partition_create - partition 2
-TA1 - rtems_partition_ident - partition 1 id = 20010001
-TA1 - rtems_partition_ident - partition 2 id = 20010002
+TA1 - rtems_partition_ident - partition 1 id = 2a010001
+TA1 - rtems_partition_ident - partition 2 id = 2a010002
TA1 - rtems_partition_get_buffer - buffer 1 from partition 1 - 0x00000000
TA1 - rtems_partition_get_buffer - buffer 2 from partition 1 - 0x00000200
TA1 - rtems_partition_get_buffer - buffer 1 from partition 2 - 0x00000000
diff --git a/testsuites/sptests/sp16/sp16.scn b/testsuites/sptests/sp16/sp16.scn
index 660e9fe352..113d08f567 100644
--- a/testsuites/sptests/sp16/sp16.scn
+++ b/testsuites/sptests/sp16/sp16.scn
@@ -1,5 +1,5 @@
*** TEST 16 ***
-TA1 - rtems_region_ident - rnid => 24010002
+TA1 - rtems_region_ident - rnid => 32010002
TA1 - rtems_region_get_segment - wait on 100 byte segment from region 2
TA1 - got segment from region 2 - 0x00000f78
TA1 - rtems_region_get_segment - wait on 3K segment from region 3
diff --git a/testsuites/sptests/sp20/sp20.scn b/testsuites/sptests/sp20/sp20.scn
index 477a3a2dac..d0726f7e07 100644
--- a/testsuites/sptests/sp20/sp20.scn
+++ b/testsuites/sptests/sp20/sp20.scn
@@ -1,21 +1,21 @@
*** TEST 20 ***
-TA1 - rtems_rate_monotonic_create id = 0x2c010001
-TA1 - rtems_rate_monotonic_ident id = 0x2c010001
+TA1 - rtems_rate_monotonic_create id = 0x42010001
+TA1 - rtems_rate_monotonic_ident id = 0x42010001
TA1 - (0x2c010001) period 2
-TA2 - rtems_rate_monotonic_create id = 0x2c010002
-TA2 - rtems_rate_monotonic_ident id = 0x2c010002
+TA2 - rtems_rate_monotonic_create id = 0x42010002
+TA2 - rtems_rate_monotonic_ident id = 0x42010002
TA2 - (0x2c010002) period 2
-TA3 - rtems_rate_monotonic_create id = 0x2c010003
-TA3 - rtems_rate_monotonic_ident id = 0x2c010003
+TA3 - rtems_rate_monotonic_create id = 0x42010003
+TA3 - rtems_rate_monotonic_ident id = 0x42010003
TA3 - (0x2c010003) period 2
-TA4 - rtems_rate_monotonic_create id = 0x2c010004
-TA4 - rtems_rate_monotonic_ident id = 0x2c010004
+TA4 - rtems_rate_monotonic_create id = 0x42010004
+TA4 - rtems_rate_monotonic_ident id = 0x42010004
TA4 - (0x2c010004) period 2
-TA5 - rtems_rate_monotonic_create id = 0x2c010005
-TA5 - rtems_rate_monotonic_ident id = 0x2c010005
+TA5 - rtems_rate_monotonic_create id = 0x42010005
+TA5 - rtems_rate_monotonic_ident id = 0x42010005
TA5 - (0x2c010005) period 100
-TA6 - rtems_rate_monotonic_create id = 0x2c010006
-TA6 - rtems_rate_monotonic_ident id = 0x2c010006
+TA6 - rtems_rate_monotonic_create id = 0x42010006
+TA6 - rtems_rate_monotonic_ident id = 0x42010006
TA6 - (0x2c010006) period 0
TA5 - PERIODS CHECK OK (1)
TA5 - PERIODS CHECK OK (2)
diff --git a/testsuites/sptests/sp22/sp22.scn b/testsuites/sptests/sp22/sp22.scn
index c95e45a73a..c58b107f06 100644
--- a/testsuites/sptests/sp22/sp22.scn
+++ b/testsuites/sptests/sp22/sp22.scn
@@ -1,8 +1,8 @@
*** TEST 22 ***
INIT - rtems_timer_create - creating timer 1
-INIT - timer 1 has id (0x14010001)
+INIT - timer 1 has id (0x12010001)
TA1 - rtems_timer_ident - identing timer 1
-TA1 - timer 1 has id (0x14010001)
+TA1 - timer 1 has id (0x12010001)
TA1 - rtems_clock_get - 09:00:00 12/31/1988
TA1 - rtems_timer_fire_after - timer 1 in 3 seconds
TA1 - rtems_task_suspend( RTEMS_SELF )
diff --git a/testsuites/sptests/sp23/sp23.scn b/testsuites/sptests/sp23/sp23.scn
index 8aef169c56..0044ce7657 100644
--- a/testsuites/sptests/sp23/sp23.scn
+++ b/testsuites/sptests/sp23/sp23.scn
@@ -1,6 +1,6 @@
*** TEST 23 ***
INIT - rtems_port_create - DP1 - int = 0x1000 ext = 0x2000
-TA1 - rtems_port_ident - 0x28010001
+TA1 - rtems_port_ident - 0x3a010001
TA1 - rtems_port_external_to_internal - 0x200e => 0x100e
TA1 - rtems_port_internal_to_external - 0x100e => 0x200e
TA1 - rtems_port_external_to_internal - 0x300e => 0x300e
diff --git a/testsuites/sptests/sp25/sp25.scn b/testsuites/sptests/sp25/sp25.scn
index d15cc46897..85ec899f43 100644
--- a/testsuites/sptests/sp25/sp25.scn
+++ b/testsuites/sptests/sp25/sp25.scn
@@ -2,7 +2,7 @@ NOTE: Addresses vary between BSPs. Please check that the addresses
printed are reasonable for your target board and that the
segments noted as being returned were allocated from the region.
*** TEST 25 ***
-TA1 - rtems_region_ident - 0x24010002
+TA1 - rtems_region_ident - 0x32010002
TA1 - rtems_region_get_segment - wait on 64 byte segment from region 1
TA1 - got segment from region 1 - 0xXXXXXXXX
TA1 - rtems_region_get_segment - wait on 128 byte segment from region 1
diff --git a/testsuites/sptests/sp31/sp31.scn b/testsuites/sptests/sp31/sp31.scn
index 9f94652602..afb11f9d27 100644
--- a/testsuites/sptests/sp31/sp31.scn
+++ b/testsuites/sptests/sp31/sp31.scn
@@ -1,12 +1,12 @@
*** TEST 31 ***
INIT - rtems_timer_create - creating timer 1
-INIT - timer 1 has id (0x14010001)
+INIT - timer 1 has id (0x12010001)
INIT - rtems_timer_create - creating timer 2
-INIT - timer 2 has id (0x14010002)
+INIT - timer 2 has id (0x12010002)
TA1 - rtems_timer_ident - identing timer 1
-TA1 - timer 1 has id (0x14010001)
+TA1 - timer 1 has id (0x12010001)
TA1 - rtems_timer_ident - identing timer 2
-TA1 - timer 2 has id (0x14010002)
+TA1 - timer 2 has id (0x12010002)
TA1 - rtems_timer_server_fire_after - 1 second
TA1 - rtems_task_wake_after - 1/2 second
TA1 - rtems_timer_server_fire_after - timer 2 in 1/2 second