change log for rtems (2010-08-09)

rtems-vc at rtems.org rtems-vc at rtems.org
Mon Aug 9 15:10:32 UTC 2010


 *joel*:
2010-08-09	Joel Sherrill <joel.sherrill at oarcorp.com>

	PR 1661/testing
	* psxchroot01/test.c, psximfs01/init.c, psximfs02/init.c,
	psxpipe01/init.c: Eliminate most references to RTEMS_Malloc_Heap.

M  1.306  testsuites/psxtests/ChangeLog
M   1.10  testsuites/psxtests/psxchroot01/test.c
M    1.6  testsuites/psxtests/psximfs01/init.c
M    1.4  testsuites/psxtests/psximfs02/init.c
M    1.3  testsuites/psxtests/psxpipe01/init.c

diff -u rtems/testsuites/psxtests/ChangeLog:1.305 rtems/testsuites/psxtests/ChangeLog:1.306
--- rtems/testsuites/psxtests/ChangeLog:1.305	Mon Aug  9 00:24:00 2010
+++ rtems/testsuites/psxtests/ChangeLog	Mon Aug  9 09:29:33 2010
@@ -1,3 +1,9 @@
+2010-08-09	Joel Sherrill <joel.sherrill at oarcorp.com>
+
+	PR 1661/testing
+	* psxchroot01/test.c, psximfs01/init.c, psximfs02/init.c,
+	psxpipe01/init.c: Eliminate most references to RTEMS_Malloc_Heap.
+
 2010-08-09	Ralf Corsépius <ralf.corsepius at rtems.org>
 
 	* psxpasswd02/init.c: Remove unused variable.

diff -u rtems/testsuites/psxtests/psxchroot01/test.c:1.9 rtems/testsuites/psxtests/psxchroot01/test.c:1.10
--- rtems/testsuites/psxtests/psxchroot01/test.c:1.9	Fri Jul 16 14:19:09 2010
+++ rtems/testsuites/psxtests/psxchroot01/test.c	Mon Aug  9 09:29:33 2010
@@ -34,7 +34,7 @@
 #include <rtems/libio.h>
 #include <rtems/userenv.h>
 #include <pmacros.h>
-#include <rtems/score/heap.h>
+#include <rtems/libcsupport.h>
 
 void touch( char *file )
 {
@@ -64,8 +64,6 @@
 }
 
 #if defined(__rtems__)
-extern Heap_Control  *RTEMS_Malloc_Heap;
-
 int test_main(void)
 #else
 int main(
@@ -76,7 +74,6 @@
 {
   int status;
   void *alloc_ptr = (void *)0;
-  Heap_Information_block Info;
 /*
  *  This test is the C equivalent of this sequence.
 #mkdir /one
@@ -108,8 +105,7 @@
   touch( "/one/two/two.test" );
 
   puts( "allocate most of memory - attempt to fail chroot - expect ENOTSUP" );
-  _Heap_Get_information(RTEMS_Malloc_Heap, &Info);
-  alloc_ptr = malloc( Info.Free.largest - 4 );
+  alloc_ptr = malloc( malloc_free_space() - 4 );
   rtems_test_assert( alloc_ptr != NULL );
 
   status = chroot( "/one" );

diff -u rtems/testsuites/psxtests/psximfs01/init.c:1.5 rtems/testsuites/psxtests/psximfs01/init.c:1.6
--- rtems/testsuites/psxtests/psximfs01/init.c:1.5	Fri Aug  6 19:22:46 2010
+++ rtems/testsuites/psxtests/psximfs01/init.c	Mon Aug  9 09:29:33 2010
@@ -17,6 +17,7 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <errno.h>
+#include <rtems/libcsupport.h>
 
 int TestFd;
 uint8_t Buffer[256];
@@ -207,15 +208,12 @@
   rtems_test_assert( rc == 0 );
 }
 
-extern Heap_Control  *RTEMS_Malloc_Heap;
-
 rtems_task Init(
   rtems_task_argument argument
 )
 {
   int i;
   void *alloc_ptr = (void *)0;
-  Heap_Information_block Info;
   int position = 0;
   int status = 0;
 
@@ -240,8 +238,7 @@
   /*
    * Allocate the heap, so that extend cannot be successful
    */
-  _Heap_Get_information( RTEMS_Malloc_Heap, &Info );
-  alloc_ptr = malloc( Info.Free.largest-4 );
+  alloc_ptr = malloc( malloc_free_space() - 4 );
 
   extend_helper();
 

diff -u rtems/testsuites/psxtests/psximfs02/init.c:1.3 rtems/testsuites/psxtests/psximfs02/init.c:1.4
--- rtems/testsuites/psxtests/psximfs02/init.c:1.3	Fri Aug  6 19:22:46 2010
+++ rtems/testsuites/psxtests/psximfs02/init.c	Mon Aug  9 09:29:33 2010
@@ -18,8 +18,8 @@
 #include <fcntl.h>
 #include <errno.h>
 #include <rtems/libio.h>
+#include <rtems/libcsupport.h>
 
-extern Heap_Control  *RTEMS_Malloc_Heap;
 void IMFS_dump( void );
 rtems_task Init(
   rtems_task_argument argument
@@ -85,8 +85,7 @@
   rtems_test_assert( errno == EACCES );
 
   puts( "Allocate most of heap" );
-  _Heap_Get_information( RTEMS_Malloc_Heap, &Info );
-  alloc_ptr = malloc( Info.Free.largest - 150 );
+  alloc_ptr = malloc( malloc_free_space() - 150 );
 
   puts( "Attempt to mount a fs at /dir01 -- expect ENOMEM" );
   status = mount( NULL,
@@ -101,8 +100,7 @@
   free( alloc_ptr );
 
   puts( "Allocate most of heap" );
-  _Heap_Get_information( RTEMS_Malloc_Heap, &Info );
-  alloc_ptr = malloc( Info.Free.largest - 4 );
+  alloc_ptr = malloc( malloc_free_space() - 4 );
 
   puts( "Changing directory to /" );
   status = chdir( "/" );

diff -u rtems/testsuites/psxtests/psxpipe01/init.c:1.2 rtems/testsuites/psxtests/psxpipe01/init.c:1.3
--- rtems/testsuites/psxtests/psxpipe01/init.c:1.2	Fri Aug  6 02:44:23 2010
+++ rtems/testsuites/psxtests/psxpipe01/init.c	Mon Aug  9 09:29:33 2010
@@ -16,10 +16,7 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <errno.h>
-
-#include <rtems/score/heap.h>
-
-extern Heap_Control  *RTEMS_Malloc_Heap;
+#include <rtems/libcsupport.h>
 
 rtems_task Init(
   rtems_task_argument not_used
@@ -29,7 +26,6 @@
   int dummy_fd[2] = {0,0};
   int status = 0;
   void *alloc_ptr = (void *)0;
-  Heap_Information_block Info;
 
   puts( "*** TEST POSIX PIPE CREATION - 01 ***" );
 
@@ -54,8 +50,7 @@
   status |= close( fd[1] );
   rtems_test_assert( status == 0 );
 
-  _Heap_Get_information(RTEMS_Malloc_Heap, &Info);
-  alloc_ptr = malloc(Info.Free.largest-4);
+  alloc_ptr = malloc( malloc_free_space() - 4 );
 
   /* case where mkfifo fails */
   puts( "Init - attempt to create pipe -- expect ENOMEM" );


 *joel*:
2010-08-09	Joel Sherrill <joel.sherrill at oarcorp.com>

	PR 1661/testing
	* spfifo02/init.c, spmountmgr01/init.c, spprivenv01/init.c: Eliminate
	most references to RTEMS_Malloc_Heap.

M  1.413  testsuites/sptests/ChangeLog
M    1.5  testsuites/sptests/spfifo02/init.c
M    1.3  testsuites/sptests/spmountmgr01/init.c
M    1.2  testsuites/sptests/spprivenv01/init.c

diff -u rtems/testsuites/sptests/ChangeLog:1.412 rtems/testsuites/sptests/ChangeLog:1.413
--- rtems/testsuites/sptests/ChangeLog:1.412	Mon Aug  9 03:46:56 2010
+++ rtems/testsuites/sptests/ChangeLog	Mon Aug  9 09:29:36 2010
@@ -1,3 +1,9 @@
+2010-08-09	Joel Sherrill <joel.sherrill at oarcorp.com>
+
+	PR 1661/testing
+	* spfifo02/init.c, spmountmgr01/init.c, spprivenv01/init.c: Eliminate
+	most references to RTEMS_Malloc_Heap.
+
 2010-08-09	Sebastian Huber <sebastian.huber at embedded-brains.de>
 
 	* sp09/screen12.c: Update for rtems_region_create() changes.

diff -u rtems/testsuites/sptests/spfifo02/init.c:1.4 rtems/testsuites/sptests/spfifo02/init.c:1.5
--- rtems/testsuites/sptests/spfifo02/init.c:1.4	Thu Jun 24 14:46:40 2010
+++ rtems/testsuites/sptests/spfifo02/init.c	Mon Aug  9 09:29:36 2010
@@ -17,7 +17,7 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <errno.h>
-#include <rtems/score/heap.h>
+#include <rtems/libcsupport.h>
 
 #define MAXIMUM 10
 #define NUM_OPEN_REQ 26
@@ -28,8 +28,6 @@
 rtems_id Semaphores[MAXIMUM];
 int SemaphoreCount;
 
-extern Heap_Control  *RTEMS_Malloc_Heap;
-
 void create_all_barriers(void)
 {
   rtems_status_code status;
@@ -132,7 +130,6 @@
   void *alloc_ptr = (void *)0;
   int num_opens = 0;
   int index = 0;
-  Heap_Information_block Info;
 
   puts( "\n\n*** TEST FIFO 08 ***" );
 
@@ -154,8 +151,7 @@
 
   delete_semaphore();
 
-  _Heap_Get_information(RTEMS_Malloc_Heap, &Info);
-  alloc_ptr = malloc(Info.Free.largest-4);
+  alloc_ptr = malloc( malloc_free_space() - 4 );
   puts("Opening FIFO.. expect ENOMEM since no memory is available");
   open_fifo(ENOMEM, O_RDWR);
 

diff -u rtems/testsuites/sptests/spmountmgr01/init.c:1.2 rtems/testsuites/sptests/spmountmgr01/init.c:1.3
--- rtems/testsuites/sptests/spmountmgr01/init.c:1.2	Fri Jul 16 10:01:11 2010
+++ rtems/testsuites/sptests/spmountmgr01/init.c	Mon Aug  9 09:29:36 2010
@@ -11,11 +11,9 @@
 
 #include <tmacros.h>
 #include "test_support.h"
-#include <rtems/score/heap.h>
 #include <errno.h>
 #include <rtems/libio_.h>
-
-extern Heap_Control  *RTEMS_Malloc_Heap;
+#include <rtems/libcsupport.h>
 
 int fs_mount( rtems_filesystem_mount_table_entry_t *mt_entry,
 	      const void                           *data )
@@ -29,13 +27,11 @@
 {
   int status = 0;
   void *alloc_ptr = (void *)0;
-  Heap_Information_block Info;
  
   puts( "\n\n*** TEST MOUNT MANAGER ROUTINE - 01 ***" );
 
   puts( "Init - allocating most of heap -- OK" );
-  _Heap_Get_information(RTEMS_Malloc_Heap, &Info);
-  alloc_ptr = malloc( Info.Free.largest - 4 );
+  alloc_ptr = malloc( malloc_free_space() - 4 );
   rtems_test_assert( alloc_ptr != NULL );
 
   puts( "Init - attempt to register filesystem fs - expect ENOMEM" );

diff -u rtems/testsuites/sptests/spprivenv01/init.c:1.1 rtems/testsuites/sptests/spprivenv01/init.c:1.2
--- rtems/testsuites/sptests/spprivenv01/init.c:1.1	Thu Jul 29 17:28:51 2010
+++ rtems/testsuites/sptests/spprivenv01/init.c	Mon Aug  9 09:29:36 2010
@@ -11,10 +11,8 @@
 
 #include <tmacros.h>
 #include "test_support.h"
-#include <rtems/score/heap.h>
 #include <rtems/libio_.h>
-
-extern Heap_Control  *RTEMS_Malloc_Heap;
+#include <rtems/libcsupport.h>
 
 rtems_task task_routine( rtems_task_argument not_used )
 {
@@ -35,16 +33,15 @@
   int sc = 0;
   bool status = 0;
   void *alloc_ptr = (void *)0;
-  Heap_Information_block Info;
   rtems_id current_task_id;
   rtems_id task_id;
   rtems_name another_task_name;
-
+  Heap_Information_block  Info;
+  
   puts( "\n\n*** TEST USER ENVIRONMENT ROUTINE - 01 ***" );
 
   puts( "Init - allocating most of heap -- OK" );
-  _Heap_Get_information(RTEMS_Malloc_Heap, &Info);
-  alloc_ptr = malloc( Info.Free.largest - 4 );
+  alloc_ptr = malloc( malloc_free_space() - 4 );
   rtems_test_assert( alloc_ptr != NULL );
 
   puts( "Init - attempt to reset env - expect RTEMS_NO_MEMORY" );


 *joel*:
2010-08-09	Bharath Suri <bharath.s.jois at gmail.com>

	PR 1661/testing
	* termios01/init.c, termios01/termios_testdriver.c,
	termios01/termios01.scn: Changes to improve coverage of
	rtems_termios_open routine.

M  1.233  testsuites/libtests/ChangeLog
M   1.12  testsuites/libtests/termios01/init.c
M    1.6  testsuites/libtests/termios01/termios01.scn
M    1.8  testsuites/libtests/termios01/termios_testdriver.c

diff -u rtems/testsuites/libtests/ChangeLog:1.232 rtems/testsuites/libtests/ChangeLog:1.233
--- rtems/testsuites/libtests/ChangeLog:1.232	Fri Aug  6 19:24:47 2010
+++ rtems/testsuites/libtests/ChangeLog	Mon Aug  9 09:36:47 2010
@@ -1,3 +1,10 @@
+2010-08-09	Bharath Suri <bharath.s.jois at gmail.com>
+
+	PR 1661/testing
+	* termios01/init.c, termios01/termios_testdriver.c,
+	termios01/termios01.scn: Changes to improve coverage of
+	rtems_termios_open routine.
+
 2010-08-06	Bharath Suri <bharath.s.jois at gmail.com>
 
 	PR 1654/testing

diff -u rtems/testsuites/libtests/termios01/init.c:1.11 rtems/testsuites/libtests/termios01/init.c:1.12
--- rtems/testsuites/libtests/termios01/init.c:1.11	Wed Jul 14 10:59:37 2010
+++ rtems/testsuites/libtests/termios01/init.c	Mon Aug  9 09:36:47 2010
@@ -469,21 +469,9 @@
   test_termios_baud2number();
   test_termios_number_to_baud();
 
-  /*
-   * tcsetattr - ERROR invalid operation
-   */
-  puts( "tcsetattr - invalid operation - ENOTSUP" );
-  rc = tcsetattr( 0, 0x12345, &t );
-  rtems_test_assert( rc == -1 );
-  rtems_test_assert( errno == ENOTSUP );
-  
-  /*
-   * tcsetattr - TCSADRAIN
-   */
-  puts( "\ntcsetattr - drain - OK" );
-  rc = tcsetattr( 1, TCSADRAIN, &t );
-  rtems_test_assert( rc == 0 );
-  
+  sc = rtems_termios_bufsize( 256, 138, 64 );
+  directive_failed( sc, "rtems_termios_bufsize" );
+
   /*
    * Register a driver
    */
@@ -505,6 +493,21 @@
     rtems_test_exit(0);
   }
 
+  /*
+   * tcsetattr - ERROR invalid operation
+   */
+  puts( "tcsetattr - invalid operation - ENOTSUP" );
+  rc = tcsetattr( test, 0x12345, &t );
+  rtems_test_assert( rc == -1 );
+  rtems_test_assert( errno == ENOTSUP );
+  
+  /*
+   * tcsetattr - TCSADRAIN
+   */
+  puts( "\ntcsetattr - drain - OK" );
+  rc = tcsetattr( test, TCSADRAIN, &t );
+  rtems_test_assert( rc == 0 );
+
   test_termios_set_baud(test);
 
   puts( "Init - close - " TERMIOS_TEST_DRIVER_DEVICE_NAME " - OK" );
@@ -588,6 +591,22 @@
     rtems_test_exit(0);
   }
 
+  /*
+  TODO: This must be enabled, but is facing a strange problem 
+  where the code dies off at rtems_termios_open.
+  */
+
+  /*
+  puts( "Multiple open of the device" );
+  for( ; index < 26; ++index ) {
+    printf( "...%d ", index );
+    test = open( TERMIOS_TEST_DRIVER_DEVICE_NAME, O_RDWR );
+    rtems_test_assert( test != -1 );
+    rc = close( test );
+    rtems_test_assert( rc == 0 );
+  }
+  puts( "" );
+  */
   puts( "*** END OF TEST TERMIOS 01 ***" );
   rtems_test_exit(0);
 }

diff -u rtems/testsuites/libtests/termios01/termios01.scn:1.5 rtems/testsuites/libtests/termios01/termios01.scn:1.6
--- rtems/testsuites/libtests/termios01/termios01.scn:1.5	Wed Jul 14 10:59:37 2010
+++ rtems/testsuites/libtests/termios01/termios01.scn	Mon Aug  9 09:36:47 2010
@@ -32,7 +32,7 @@
 termios_baud_to_number(B110) - OK
 termios_baud_to_number(B134) - OK
 termios_baud_to_number(B150) - OK
-termios_baud_to_number(B200) - O
+termios_baud_to_number(B200) - OK
 termios_baud_to_number(B300) - OK
 termios_baud_to_number(B600) - OK
 termios_baud_to_number(B1200) - OK
@@ -70,9 +70,6 @@
 termios_number_to_baud(B115200) - OK
 termios_number_to_baud(B230400) - OK
 termios_number_to_baud(B460800) - OK
-tcsetattr - invalid operation - ENOTSUP
-
-tcsetattr - drain - OK
 
 Init - rtems_io_register_driver - Termios Test Driver - OK
 Termios_test_driver - rtems_io_register /dev/test - OK
@@ -80,87 +77,91 @@
 Init - open - /dev/test - OK
 Termios_test_driver - rtems_set_initial_baud - bad baud - OK
 Termios_test_driver - rtems_set_initial_baud - 38400 - OK
+tcsetattr - invalid operation - ENOTSUP
+
+tcsetattr - drain - OK
+set_attributes - B0 5-NONE-1
 Test termios setting device baud rate...
 tcsetattr(TCSANOW, B0) - OK
-set_attributes - B0 8-NONE-1
+set_attributes - B0 5-NONE-1
 tcsetattr(TCSADRAIN, B0) - OK
-set_attributes - B0 8-NONE-1
+set_attributes - B0 5-NONE-1
 tcsetattr(TCSANOW, B50) - OK
-set_attributes - B50 8-NONE-1
+set_attributes - B50 5-NONE-1
 tcsetattr(TCSADRAIN, B50) - OK
-set_attributes - B50 8-NONE-1
+set_attributes - B50 5-NONE-1
 tcsetattr(TCSANOW, B75) - OK
-set_attributes - B75 8-NONE-1
+set_attributes - B75 5-NONE-1
 tcsetattr(TCSADRAIN, B75) - OK
-set_attributes - B75 8-NONE-1
+set_attributes - B75 5-NONE-1
 tcsetattr(TCSANOW, B110) - OK
-set_attributes - B110 8-NONE-1
+set_attributes - B110 5-NONE-1
 tcsetattr(TCSADRAIN, B110) - OK
-set_attributes - B110 8-NONE-1
+set_attributes - B110 5-NONE-1
 tcsetattr(TCSANOW, B134) - OK
-set_attributes - B134 8-NONE-1
+set_attributes - B134 5-NONE-1
 tcsetattr(TCSADRAIN, B134) - OK
-set_attributes - B134 8-NONE-1
+set_attributes - B134 5-NONE-1
 tcsetattr(TCSANOW, B150) - OK
-set_attributes - B150 8-NONE-1
+set_attributes - B150 5-NONE-1
 tcsetattr(TCSADRAIN, B150) - OK
-set_attributes - B150 8-NONE-1
+set_attributes - B150 5-NONE-1
 tcsetattr(TCSANOW, B200) - OK
-set_attributes - B200 8-NONE-1
+set_attributes - B200 5-NONE-1
 tcsetattr(TCSADRAIN, B200) - OK
-set_attributes - B200 8-NONE-1
+set_attributes - B200 5-NONE-1
 tcsetattr(TCSANOW, B300) - OK
-set_attributes - B300 8-NONE-1
+set_attributes - B300 5-NONE-1
 tcsetattr(TCSADRAIN, B300) - OK
-set_attributes - B300 8-NONE-1
+set_attributes - B300 5-NONE-1
 tcsetattr(TCSANOW, B600) - OK
-set_attributes - B600 8-NONE-1
+set_attributes - B600 5-NONE-1
 tcsetattr(TCSADRAIN, B600) - OK
-set_attributes - B600 8-NONE-1
+set_attributes - B600 5-NONE-1
 tcsetattr(TCSANOW, B1200) - OK
-set_attributes - B1200 8-NONE-1
+set_attributes - B1200 5-NONE-1
 tcsetattr(TCSADRAIN, B1200) - OK
-set_attributes - B1200 8-NONE-1
+set_attributes - B1200 5-NONE-1
 tcsetattr(TCSANOW, B1800) - OK
-set_attributes - B1800 8-NONE-1
+set_attributes - B1800 5-NONE-1
 tcsetattr(TCSADRAIN, B1800) - OK
-set_attributes - B1800 8-NONE-1
+set_attributes - B1800 5-NONE-1
 tcsetattr(TCSANOW, B2400) - OK
-set_attributes - B2400 8-NONE-1
+set_attributes - B2400 5-NONE-1
 tcsetattr(TCSADRAIN, B2400) - OK
-set_attributes - B2400 8-NONE-1
+set_attributes - B2400 5-NONE-1
 tcsetattr(TCSANOW, B4800) - OK
-set_attributes - B4800 8-NONE-1
+set_attributes - B4800 5-NONE-1
 tcsetattr(TCSADRAIN, B4800) - OK
-set_attributes - B4800 8-NONE-1
+set_attributes - B4800 5-NONE-1
 tcsetattr(TCSANOW, B9600) - OK
-set_attributes - B9600 8-NONE-1
+set_attributes - B9600 5-NONE-1
 tcsetattr(TCSADRAIN, B9600) - OK
-set_attributes - B9600 8-NONE-1
+set_attributes - B9600 5-NONE-1
 tcsetattr(TCSANOW, B19200) - OK
-set_attributes - B19200 8-NONE-1
+set_attributes - B19200 5-NONE-1
 tcsetattr(TCSADRAIN, B19200) - OK
-set_attributes - B19200 8-NONE-1
+set_attributes - B19200 5-NONE-1
 tcsetattr(TCSANOW, B38400) - OK
-set_attributes - B38400 8-NONE-1
+set_attributes - B38400 5-NONE-1
 tcsetattr(TCSADRAIN, B38400) - OK
-set_attributes - B38400 8-NONE-1
+set_attributes - B38400 5-NONE-1
 tcsetattr(TCSANOW, B57600) - OK
-set_attributes - B57600 8-NONE-1
+set_attributes - B57600 5-NONE-1
 tcsetattr(TCSADRAIN, B57600) - OK
-set_attributes - B57600 8-NONE-1
+set_attributes - B57600 5-NONE-1
 tcsetattr(TCSANOW, B115200) - OK
-set_attributes - B115200 8-NONE-1
+set_attributes - B115200 5-NONE-1
 tcsetattr(TCSADRAIN, B115200) - OK
-set_attributes - B115200 8-NONE-1
+set_attributes - B115200 5-NONE-1
 tcsetattr(TCSANOW, B230400) - OK
-set_attributes - B230400 8-NONE-1
+set_attributes - B230400 5-NONE-1
 tcsetattr(TCSADRAIN, B230400) - OK
-set_attributes - B230400 8-NONE-1
+set_attributes - B230400 5-NONE-1
 tcsetattr(TCSANOW, B460800) - OK
-set_attributes - B460800 8-NONE-1
+set_attributes - B460800 5-NONE-1
 tcsetattr(TCSADRAIN, B460800) - OK
-set_attributes - B460800 8-NONE-1
+set_attributes - B460800 5-NONE-1
 Init - close - /dev/test - OK
 
 Init - open - /dev/test - OK

diff -u rtems/testsuites/libtests/termios01/termios_testdriver.c:1.7 rtems/testsuites/libtests/termios01/termios_testdriver.c:1.8
--- rtems/testsuites/libtests/termios01/termios_testdriver.c:1.7	Thu Dec 10 08:26:32 2009
+++ rtems/testsuites/libtests/termios01/termios_testdriver.c	Mon Aug  9 09:36:47 2010
@@ -16,6 +16,7 @@
 #include <stdlib.h>
 #include <termios.h>
 #include <rtems/termiostypes.h>
+#include <rtems/libcsupport.h>
 #include "termios_testdriver.h"
 
 int termios_test_driver_inbyte_nonblocking( int port )
@@ -138,6 +139,10 @@
   rtems_status_code sc;
   int               rc;
   rtems_libio_open_close_args_t *args = arg;
+  void *alloc_ptr = (void *)0;
+  static int test = 0;
+  size_t freeMemory;
+  
   static const rtems_termios_callbacks Callbacks = {
     NULL,                                    /* firstOpen */
     NULL,                                    /* lastClose */
@@ -154,6 +159,41 @@
     rtems_test_exit(0);
   }
 
+  freeMemory = malloc_free_space();
+  if( test == 0 ) {
+    alloc_ptr = malloc( freeMemory - 4 );
+    
+    sc = rtems_termios_open (major, minor, arg, &Callbacks);
+    rtems_test_assert( sc == RTEMS_NO_MEMORY );
+    
+    free( alloc_ptr );
+    alloc_ptr = malloc( freeMemory - 4 - 10 -
+			sizeof( struct rtems_termios_tty ) );
+    
+    sc = rtems_termios_open (major, minor, arg, &Callbacks);
+    rtems_test_assert( sc == RTEMS_NO_MEMORY );
+    
+    free( alloc_ptr );
+    alloc_ptr = malloc( freeMemory - 4 - 20 -
+			sizeof( struct rtems_termios_tty ) -
+			128 );
+    
+    sc = rtems_termios_open (major, minor, arg, &Callbacks);
+    rtems_test_assert( sc == RTEMS_NO_MEMORY );
+    
+    free( alloc_ptr );
+    alloc_ptr = malloc( freeMemory - 4 - 20 -
+			sizeof( struct rtems_termios_tty ) -
+			128 -
+			80 );
+    
+    sc = rtems_termios_open (major, minor, arg, &Callbacks);
+    rtems_test_assert( sc == RTEMS_NO_MEMORY );
+    
+    free( alloc_ptr );
+    test = 1;
+  }
+  
   sc = rtems_termios_open (major, minor, arg, &Callbacks);
   directive_failed( sc, "rtems_termios_open" );
 


 *joel*:
2010-08-09	Bharath Suri <bharath.s.jois at gmail.com>

	PR 1661/testing
	* psximfs02/init.c: Changes to improve coverage of
	imfs_initsupp.c, by using a bad value for
	CONFIGURE_IMFS_MEMFILE_BYTES_PER_BLOCK

M  1.307  testsuites/psxtests/ChangeLog
M    1.5  testsuites/psxtests/psximfs02/init.c

diff -u rtems/testsuites/psxtests/ChangeLog:1.306 rtems/testsuites/psxtests/ChangeLog:1.307
--- rtems/testsuites/psxtests/ChangeLog:1.306	Mon Aug  9 09:29:33 2010
+++ rtems/testsuites/psxtests/ChangeLog	Mon Aug  9 09:37:01 2010
@@ -1,3 +1,10 @@
+2010-08-09	Bharath Suri <bharath.s.jois at gmail.com>
+
+	PR 1661/testing
+	* psximfs02/init.c: Changes to improve coverage of
+	imfs_initsupp.c, by using a bad value for
+	CONFIGURE_IMFS_MEMFILE_BYTES_PER_BLOCK
+
 2010-08-09	Joel Sherrill <joel.sherrill at oarcorp.com>
 
 	PR 1661/testing

diff -u rtems/testsuites/psxtests/psximfs02/init.c:1.4 rtems/testsuites/psxtests/psximfs02/init.c:1.5
--- rtems/testsuites/psxtests/psximfs02/init.c:1.4	Mon Aug  9 09:29:33 2010
+++ rtems/testsuites/psxtests/psximfs02/init.c	Mon Aug  9 09:37:01 2010
@@ -185,6 +185,7 @@
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 
 #define CONFIGURE_MAXIMUM_TASKS                  1
+#define CONFIGURE_IMFS_MEMFILE_BYTES_PER_BLOCK   15
 #define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 4
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 



--

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/20100809/a25b8807/attachment-0001.html>


More information about the vc mailing list