Removed DEBUG definitions so output from Google Test more clear.

bk: 4c4f55a9ea3F96Lrdyivgvp2WqVM6Q

diff --git a/sntp/header.h b/sntp/header.h
index 4e3fa9661a10c4120d0734480b7d0e3b9f93ebfc..21805f1950061d65284c9cc4bca3f56f7dd9d319 100644 (file)
--- a/sntp/header.h
+++ b/sntp/header.h
@@ -24,7 +24,7 @@ No changes should be needed for any system that is even remotely like Unix. */
 #    define SAVENAME "/etc/sntp.state" /* Stores the recovery state */
 #endif
 
-#define DEBUG
+//#define DEBUG
 
 
 

diff --git a/sntp/kod_management.c b/sntp/kod_management.c
index 12bc1562c0b03ca3b67702695525ab77a972fb76..99631ebc3365c6d60b2985f2fe945f4a4248ec18 100644 (file)
--- a/sntp/kod_management.c
+++ b/sntp/kod_management.c
@@ -7,7 +7,7 @@
 #include "log.h"
 #include "sntp-opts.h"
 #include "ntp_stdlib.h"
-#define DEBUG
+//#define DEBUG
 
 int kod_init = 0, kod_db_cnt = 0;
 const char *kod_db_file;

diff --git a/tests/sntp/Makefile.am b/tests/sntp/Makefile.am
index d823e44a4f40df85d145b7a9ec80d7ed77b9df76..e10a91e800fa37e9966bd430487f32ef256609e9 100644 (file)
--- a/tests/sntp/Makefile.am
+++ b/tests/sntp/Makefile.am
@@ -1,22 +1,27 @@
 check_PROGRAMS = tests
-LDADD = @GTEST_LDFLAGS@ @GTEST_LIBS@ $(LIBOPTS_LDADD) @top_builddir@/libntp/libntp.a
-AM_CXXFLAGS = @GTEST_CXXFLAGS@
-AM_CPPFLAGS = @GTEST_CPPFLAGS@
 
-sntp_src = $(top_srcdir)/sntp
+sntp_src = $(top_builddir)/sntp
 
-sntp_SOURCES_USED =    $(sntp_src)/kod_management.c    \
-                       $(sntp_src)/log.c               \
-                       $(sntp_src)/sntp-opts.c
+sntp_SOURCES_USED =    $(sntp_src)/kod_management.o    \
+                       $(sntp_src)/log.o               \
+                       $(sntp_src)/sntp-opts.o
 
 base_SOURCES =         ../main.cpp     \
                        sntptest.cpp
 
 tests_SOURCES = $(base_SOURCES)                \
                kodDatabase.cpp         \
-               kodFile.cpp             \
+               kodFile.cpp
+
+LDADD =        @GTEST_LDFLAGS@                 \
+               @GTEST_LIBS@                    \
+               $(LIBOPTS_LDADD)                \
+               @top_builddir@/libntp/libntp.a  \
                $(sntp_SOURCES_USED)
 
+AM_CXXFLAGS = @GTEST_CXXFLAGS@
+AM_CPPFLAGS = @GTEST_CPPFLAGS@
+
 INCLUDES = $(LIBOPTS_CFLAGS) -I$(top_srcdir)/include -I$(top_srcdir)/lib/isc/include \
        -I$(top_srcdir)/lib/isc/nothreads/include \
        -I$(top_srcdir)/lib/isc/unix/include \