From b33755aac7b4e75aeeed7bbadebb703eaf4ca5a1 Mon Sep 17 00:00:00 2001 From: Damir Tomic Date: Thu, 25 Jun 2015 09:19:32 +0200 Subject: [PATCH] Makefile.am: minor fix for buildin libunity.a minor fix for building libunity.a crypto.c~1ed7d1829a6a73e5: Delete: sntp/tests/crypto.c crypto.c: Rename: BitKeeper/deleted/23/crypto.c~1ed7d1829a6a73e5 -> sntp/tests/crypto.c bug-2803.c: function now returns x instead of 0 bk: 558bab84qlMSTFrv1T178seeUHGaog --- tests/bug-2803/Makefile.am | 2 +- tests/bug-2803/bug-2803.c | 10 +++++----- tests/libntp/Makefile.am | 2 +- tests/libntp/run-sfptostr.c | 1 + 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/tests/bug-2803/Makefile.am b/tests/bug-2803/Makefile.am index dca6e4b51..eaf825fea 100644 --- a/tests/bug-2803/Makefile.am +++ b/tests/bug-2803/Makefile.am @@ -64,7 +64,7 @@ check-libunity: ../../sntp/unity/libunity.a @echo stamp > $@ ../../sntp/unity/libunity.a: - cd ../../libunity && $(MAKE) $(AM_MAKEFLAGS) libunity.a + cd ../../sntp/unity && $(MAKE) $(AM_MAKEFLAGS) libunity.a include $(top_srcdir)/depsver.mf include $(top_srcdir)/includes.mf diff --git a/tests/bug-2803/bug-2803.c b/tests/bug-2803/bug-2803.c index e494ca263..4ee6f0253 100644 --- a/tests/bug-2803/bug-2803.c +++ b/tests/bug-2803/bug-2803.c @@ -93,14 +93,14 @@ int test_loop( long long start_sec, long start_usec, int simpleTest( void ) { - + int x; // loop from {0.0} to {1.1000000} stepping by tv_sec by 1 and tv_usec by 100000 - test_loop( 0, 0, 1, MICROSECONDS, 1, MICROSECONDS / 10 ); + x = test_loop( 0, 0, 1, MICROSECONDS, 1, MICROSECONDS / 10 ); - // test_loop( 0, 0, 5, MICROSECONDS, 1, MICROSECONDS / 1000 ); - // test_loop( 0, 0, -5, -MICROSECONDS, -1, -MICROSECONDS / 1000 ); + // x = test_loop( 0, 0, 5, MICROSECONDS, 1, MICROSECONDS / 1000 ); + // x = test_loop( 0, 0, -5, -MICROSECONDS, -1, -MICROSECONDS / 1000 ); - return 0; + return x; } diff --git a/tests/libntp/Makefile.am b/tests/libntp/Makefile.am index c7d1b9e14..1887b25dd 100644 --- a/tests/libntp/Makefile.am +++ b/tests/libntp/Makefile.am @@ -834,7 +834,7 @@ check-libunity: ../../sntp/unity/libunity.a @echo stamp > $@ ../../sntp/unity/libunity.a: - cd ../../libunity && $(MAKE) $(AM_MAKEFLAGS) libunity.a + cd ../../sntp/unity && $(MAKE) $(AM_MAKEFLAGS) libunity.a include $(top_srcdir)/depsver.mf include $(top_srcdir)/includes.mf diff --git a/tests/libntp/run-sfptostr.c b/tests/libntp/run-sfptostr.c index 41bf07876..1c28fe8c5 100644 --- a/tests/libntp/run-sfptostr.c +++ b/tests/libntp/run-sfptostr.c @@ -26,6 +26,7 @@ //=======External Functions This Runner Calls===== extern void setUp(void); extern void tearDown(void); +void resetTest(void); extern void test_PositiveInteger(void); extern void test_NegativeInteger(void); extern void test_PositiveIntegerPositiveFraction(void); -- 2.47.3