change log for rtems (2011-09-02)

[rtems-vc at rtems.org]

 *sh*:
2011-09-02	Sebastian Huber <sebastian.huber at embedded-brains.de>

	* sp40/init.c: Avoid unsupported test cases.

M  1.478  testsuites/sptests/ChangeLog
M    1.8  testsuites/sptests/sp40/init.c

diff -u rtems/testsuites/sptests/ChangeLog:1.477 rtems/testsuites/sptests/ChangeLog:1.478
--- rtems/testsuites/sptests/ChangeLog:1.477	Mon Aug 22 05:10:55 2011
+++ rtems/testsuites/sptests/ChangeLog	Fri Sep  2 07:20:15 2011
@@ -1,3 +1,7 @@
+2011-09-02	Sebastian Huber <sebastian.huber at embedded-brains.de>
+
+	* sp40/init.c: Avoid unsupported test cases.
+
 2011-08-22	Sebastian Huber <sebastian.huber at embedded-brains.de>
 
 	* spfatal13/testcase.h: Fixed test name.

diff -u rtems/testsuites/sptests/sp40/init.c:1.7 rtems/testsuites/sptests/sp40/init.c:1.8
--- rtems/testsuites/sptests/sp40/init.c:1.7	Tue Feb 22 01:37:00 2011
+++ rtems/testsuites/sptests/sp40/init.c	Fri Sep  2 07:20:15 2011
@@ -62,9 +62,15 @@
   rtems_device_major_number registered_not;
   rtems_device_major_number invalid_major = _IO_Number_of_drivers + 1;
   rtems_interrupt_level level;
+  bool do_interrupt_context_test = true;
 
   puts( "\n\n*** TEST 40 ***" );
 
+  /* Ensure that this test works as expected */
+  test_interrupt_context_enter( level );
+  do_interrupt_context_test = rtems_interrupt_is_in_progress();
+  test_interrupt_context_leave( level );
+
   /*
    *  Register a driver with init == NULL and open != NULL
    */
@@ -100,14 +106,16 @@
   directive_failed( sc, "rtems_io_register_driver" );
 
   puts( "Init - rtems_io_register_driver - called from interrupt context" );
-  test_interrupt_context_enter( level );
-  sc = rtems_io_register_driver( 0, NULL, NULL );
-  test_interrupt_context_leave( level );
-  fatal_directive_status(
-    sc,
-    RTEMS_CALLED_FROM_ISR,
-    "rtems_io_register_driver"
-  );
+  if ( do_interrupt_context_test ) {
+    test_interrupt_context_enter( level );
+    sc = rtems_io_register_driver( 0, NULL, NULL );
+    test_interrupt_context_leave( level );
+    fatal_directive_status(
+      sc,
+      RTEMS_CALLED_FROM_ISR,
+      "rtems_io_register_driver"
+    );
+  }
 
   puts( "Init - rtems_io_register_driver - invalid registered major pointer" );
   sc = rtems_io_register_driver( 0, NULL, NULL );
@@ -144,14 +152,16 @@
   );
 
   puts( "Init - rtems_io_unregister_driver - called from interrupt context" );
-  test_interrupt_context_enter( level );
-  sc = rtems_io_unregister_driver( 0 );
-  test_interrupt_context_leave( level );
-  fatal_directive_status(
-    sc,
-    RTEMS_CALLED_FROM_ISR,
-    "rtems_io_unregister_driver"
-  );
+  if ( do_interrupt_context_test ) {
+    test_interrupt_context_enter( level );
+    sc = rtems_io_unregister_driver( 0 );
+    test_interrupt_context_leave( level );
+    fatal_directive_status(
+      sc,
+      RTEMS_CALLED_FROM_ISR,
+      "rtems_io_unregister_driver"
+    );
+  }
 
   puts( "Init - rtems_io_unregister_driver - invalid major number" );
   sc = rtems_io_unregister_driver( invalid_major );



--

Generated by Deluxe Loginfo [http://www.codewiz.org/projects/index.html#loginfo] 2.122 by Bernardo Innocenti <bernie at develer.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.rtems.org/pipermail/vc/attachments/20110902/3cd9f83c/attachment-0001.html>