[Tinyos-2-commits] CVS: tinyos-2.x-contrib/tunit/tests/tinyos-2.x/tos/chips/general_radio_tests/TestMac TestMacP.nc, 1.1, 1.2

[David Moss]

Update of /cvsroot/tinyos/tinyos-2.x-contrib/tunit/tests/tinyos-2.x/tos/chips/general_radio_tests/TestMac
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv16769

Modified Files:
	TestMacP.nc 
Log Message:
Don't know why the compiler is throwing up an error, but I surrounded the if-else with {}'s to encapsulate the assertion macro.  We'll see if that allows the test to compile.

Index: TestMacP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x-contrib/tunit/tests/tinyos-2.x/tos/chips/general_radio_tests/TestMac/TestMacP.nc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TestMacP.nc	9 Nov 2007 17:15:58 -0000	1.1
--- TestMacP.nc	29 Jan 2008 17:59:26 -0000	1.2
***************
*** 97,104 ****
  		if( state == STATE_READY )
  		{
! 			if( TOS_NODE_ID == 0 )
  				assertFail("unexpected test message before startup");
! 			else
  				realStart();
  		}
  		else if( state != STATE_RUNNING )
--- 97,105 ----
  		if( state == STATE_READY )
  		{
! 			if( TOS_NODE_ID == 0 ) {
  				assertFail("unexpected test message before startup");
! 			} else {
  				realStart();
+ 			}
  		}
  		else if( state != STATE_RUNNING )
***************
*** 289,296 ****
  	event void TestCase.run()
  	{
! 		if( TOS_NODE_ID != 0 )
  			assertFail("unexpected testcase run");
! 		else
  			realStart();
  	}
  }
--- 290,298 ----
  	event void TestCase.run()
  	{
! 		if( TOS_NODE_ID != 0 ) {
  			assertFail("unexpected testcase run");
! 		} else {
  			realStart();
+ 	  	}
  	}
  }