[Tinyos-2-commits] CVS: tinyos-2.x/apps/tests/storage/Config RandRWC.nc, 1.1.2.2, 1.1.2.3

Jonathan Hui jwhui at users.sourceforge.net
Wed Jun 7 12:57:52 PDT 2006


Update of /cvsroot/tinyos/tinyos-2.x/apps/tests/storage/Config
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv13329

Modified Files:
      Tag: tinyos-2_0_devel-BRANCH
	RandRWC.nc 
Log Message:

Munge around unit test so that it doesn't cause msp430-gcc to segfault.

Remove initial read after write from test since this case is not
supported in the stm25p config storage stack.



Index: RandRWC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/apps/tests/storage/Config/Attic/RandRWC.nc,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -d -r1.1.2.2 -r1.1.2.3
*** RandRWC.nc	30 May 2006 21:36:58 -0000	1.1.2.2
--- RandRWC.nc	7 Jun 2006 19:57:50 -0000	1.1.2.3
***************
*** 120,127 ****
      for (i = 0; i < NWRITES; i++)
        {
! 	ops[i].addr = rand() & (SIZE - 1);
! 	ops[i].len = rand() >> 7;
! 	if (ops[i].addr + ops[i].len > SIZE)
! 	  ops[i].addr = SIZE - ops[i].len;
  	offset = rand() >> 8;
  	if (offset + ops[i].len > sizeof data)
--- 120,129 ----
      for (i = 0; i < NWRITES; i++)
        {
! 	uint16_t addr = rand() & (SIZE - 1);
! 	uint16_t len = rand() >> 7;
! 	if (addr + len > SIZE)
! 	  addr = SIZE - len;
! 	ops[i].addr = addr;
! 	ops[i].len = len;
  	offset = rand() >> 8;
  	if (offset + ops[i].len > sizeof data)
***************
*** 235,239 ****
    const uint8_t actions[] = {
      A_WRITE,
!     A_READ,
      A_COMMIT,
      A_READ,
--- 237,241 ----
    const uint8_t actions[] = {
      A_WRITE,
!     //A_READ,
      A_COMMIT,
      A_READ,



More information about the Tinyos-2-commits mailing list