tm07: Split some code into new spnotepad02.

Use of deprecated notepads in sp07 needs further work.

Updates #2305.

4 files changed, 27 insertions, 21 deletions

diff --git a/testsuites/sptests/sp07/init.c b/testsuites/sptests/sp07/init.c
index c08c5c4c18..0211a94e3a 100644
--- a/testsuites/sptests/sp07/init.c
+++ b/testsuites/sptests/sp07/init.c
@@ -210,25 +210,23 @@ rtems_task Init(
   directive_failed( status, "rtems_task_restart of TA3" );
   assert_extension_counts( &Task_restarted[ 0 ], 0x0 );
 
-  status = rtems_task_set_note( rtems_task_self(), RTEMS_NOTEPAD_4, 32 );
-  directive_failed( status, "task_set_node of Self id" );
-  printf( "INIT - rtems_task_set_note - set my (id) RTEMS_NOTEPAD_4 " );
-  puts  ( "to TA1's priority: 04" );
-
-  status = rtems_task_set_note( RTEMS_SELF, RTEMS_NOTEPAD_4, 32 );
-  directive_failed( status, "task_set_node of Self 0" );
-  printf( "INIT - rtems_task_set_note - set my (SELF) RTEMS_NOTEPAD_4 " );
-  puts  ( "to TA1's priority: 04" );
-
-  status = rtems_task_set_note( Task_id[ 1 ], RTEMS_NOTEPAD_8, 4 );
-  directive_failed( status, "task_set_node of TA1" );
-  printf( "INIT - rtems_task_set_note - set TA1's RTEMS_NOTEPAD_8 " );
-  puts  ( "to TA1's priority: 04" );
-
-  status = rtems_task_set_note( Task_id[ 2 ], RTEMS_NOTEPAD_8, 4 );
-  directive_failed( status, "task_set_node of TA2" );
-  printf( "INIT - rtems_task_set_note - set TA2's RTEMS_NOTEPAD_8 " );
-  puts  ( "to TA2's priority: 04");
+ /*
+  * We know this is deprecated and don't want a warning on every BSP built.
+  */
+  #pragma GCC diagnostic push
+  #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+
+    status = rtems_task_set_note( Task_id[ 1 ], RTEMS_NOTEPAD_8, 4 );
+    directive_failed( status, "task_set_node of TA1" );
+    printf( "INIT - rtems_task_set_note - set TA1's RTEMS_NOTEPAD_8 " );
+    puts  ( "to TA1's priority: 04" );
+
+    status = rtems_task_set_note( Task_id[ 2 ], RTEMS_NOTEPAD_8, 4 );
+    directive_failed( status, "task_set_node of TA2" );
+    printf( "INIT - rtems_task_set_note - set TA2's RTEMS_NOTEPAD_8 " );
+    puts  ( "to TA2's priority: 04");
+
+  #pragma GCC diagnostic pop
 
   status = rtems_task_delete( RTEMS_SELF );
   directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
diff --git a/testsuites/sptests/sp07/sp07.scn b/testsuites/sptests/sp07/sp07.scn
index 0fe6f296c4..77a9b24521 100644
--- a/testsuites/sptests/sp07/sp07.scn
+++ b/testsuites/sptests/sp07/sp07.scn
@@ -10,8 +10,6 @@ rtems_extension_ident -- OK
 rtems_extension_ident - bad name -- RTEMS_INVALID_NAME
 rtems_extension_ident - bad name -- RTEMS_INVALID_ADDRESS
 rtems_extension_create - harmless -- OK
-INIT - rtems_task_set_note - set my (id) RTEMS_NOTEPAD_4 to TA1's priority: 04
-INIT - rtems_task_set_note - set my (SELF) RTEMS_NOTEPAD_4 to TA1's priority: 04
 INIT - rtems_task_set_note - set TA1's RTEMS_NOTEPAD_8 to TA1's priority: 04
 INIT - rtems_task_set_note - set TA2's RTEMS_NOTEPAD_8 to TA2's priority: 04
 <pause>
diff --git a/testsuites/sptests/sp07/task1.c b/testsuites/sptests/sp07/task1.c
index 15bc7a17ca..18c6375473 100644
--- a/testsuites/sptests/sp07/task1.c
+++ b/testsuites/sptests/sp07/task1.c
@@ -13,6 +13,11 @@
 
 #include "system.h"
 
+/*
+ * We know this is deprecated and don't want a warning on every BSP built.
+ */
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+
 rtems_task Task_1(
   rtems_task_argument argument
 )
diff --git a/testsuites/sptests/sp07/task2.c b/testsuites/sptests/sp07/task2.c
index 6451fffb07..11165ee73b 100644
--- a/testsuites/sptests/sp07/task2.c
+++ b/testsuites/sptests/sp07/task2.c
@@ -13,6 +13,11 @@
 
 #include "system.h"
 
+/*
+ * We know this is deprecated and don't want a warning on every BSP built.
+ */
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+
 rtems_task Task_2(
   rtems_task_argument argument
 )