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

diff --git a/tests/bug-2803/Makefile.am b/tests/bug-2803/Makefile.am
index dca6e4b5138d017413a0c2c46a3fffca0732cede..eaf825feaab0a240b1f889f12789fabf75d870f1 100644 (file)
--- 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 e494ca26323760690fc6682b1750d47c078ecfd7..4ee6f02532a1840785791b7e290d68e514d224a7 100644 (file)
--- 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 c7d1b9e147357618cf0768922dd45a7c69036888..1887b25dd08d3e5ecf30510f9929b3a11c2afa93 100644 (file)
--- 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 41bf07876e67f017629b6d67746c2ac07ca13194..1c28fe8c57ff0d0a27d8de0738548ec1f56cd4f8 100644 (file)
--- 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);