nrtb-core team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 34
committer: fpstovall@xxxxxxxxx
branch nick: dev
timestamp: Thu 2011-07-21 18:30:26 -0400
message:
  Corrected two issues with the timer unit test:
     1. The makefile had the test after deployment, correct to test first.
     2. There were some incorrect sleep times printed.. corrected.
modified:
  common/timer/Makefile
  common/timer/timer_test.cpp


--
lp:~fpstovall/nrtb/cpp_common
https://code.launchpad.net/~fpstovall/nrtb/cpp_common

Your team NRTB Core is subscribed to branch lp:~fpstovall/nrtb/cpp_common.
To unsubscribe from this branch go to https://code.launchpad.net/~fpstovall/nrtb/cpp_common/+edit-subscription

=== modified file 'common/timer/Makefile'
--- common/timer/Makefile	2011-07-19 00:26:10 +0000
+++ common/timer/Makefile	2011-07-21 22:30:26 +0000
@@ -17,9 +17,9 @@
 #***********************************************
 
 lib:	timer_test
+	@./timer_test
 	@cp -v hires_timer.h ../include
 	@cp -v hires_timer.o ../obj
-	@./timer_test
 	@echo build complete
 
 hires_timer.o:	hires_timer.h hires_timer.cpp Makefile

=== modified file 'common/timer/timer_test.cpp'
--- common/timer/timer_test.cpp	2011-07-21 09:54:03 +0000
+++ common/timer/timer_test.cpp	2011-07-21 22:30:26 +0000
@@ -36,16 +36,16 @@
 	  cout << "sleep 0.1 second" << endl;
 	  usleep(1e5);
 	  cout << overall.interval() << " | " << interval.stop() << " (stop)" << endl;
-	  cout << "sleep 3 seconds" << endl;
+	  cout << "sleep 0.3 seconds" << endl;
 	  usleep(3e5);
 	  cout << overall.interval() << " | " << interval.stop() << " (start)" << endl;	
 	  interval.start();
-	  cout << "sleep 2 seconds" << endl;
+	  cout << "sleep 0.2 seconds" << endl;
 	  usleep(2e5);
 	  cout << overall.interval() << " | " << interval.stop() << " (reset)" << endl;
 	  interval.reset();
 	  interval.start();
-	  cout << "sleep 500000 useconds" << endl;
+	  cout << "sleep 0.5 seconds" << endl;
 	  usleep(5e5);
 	  cout << overall.interval() << " | " << interval.stop() << endl;
 	  // test the advanced formationg function