Makefile.am:

  adding new Makefile
  minor change
Makefile.am, t-ntpq.c:
  update

bk: 55c3af6egc9rOkRY4vuTTL1BdCMeSA

diff --git a/tests/Makefile.am b/tests/Makefile.am
index fb43cbaaafb458541c13d811d47c6fcd70301769..d11a1b38a71361e4e0ed2b2fc94c372cfefbd4fe 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -12,6 +12,7 @@ SUBDIRS +=            \
        bug-2803        \
        libntp          \
        sec-2853        \
+       ntpd            \
        ntpq            \
        $(NULL)
 

diff --git a/tests/ntpq/Makefile.am b/tests/ntpq/Makefile.am
index 4bb353024f5b9d00c9fac8789bd91ae1aa20618f..d724a44eb3da9485fe6addfb80ab9dd8f2a5808d 100644 (file)
--- a/tests/ntpq/Makefile.am
+++ b/tests/ntpq/Makefile.am
@@ -8,19 +8,18 @@ std_unity_list =                                              \
 
 run_unity =    cd $(srcdir) && ruby ../../sntp/unity/auto/generate_test_runner.rb
 
-check_PROGRAMS =               \
-       test-ntpq               \
+check_PROGRAMS =       \
+       test-ntpq       \
        $(NULL)
 
 
 LDADD =                                        \
+       $(top_builddir)/ntpq/libntpq.a  \
        $(top_builddir)/ntpd/libntpd.a  \
        $(top_builddir)/libntp/libntp.a \
        $(LDADD_LIBNTP)                 \
        $(PTHREAD_LIBS)                 \
        $(LDADD_NTP)                    \
-       $(GTEST_LDFLAGS)                \
-       $(GTEST_LIBS)                   \
        $(NULL)
 
 unity_tests_LDADD =                            \
@@ -32,9 +31,10 @@ unity_tests_LDADD =                          \
 AM_CFLAGS   = $(CFLAGS_NTP)
 AM_CXXFLAGS = $(GTEST_CXXFLAGS)
 
-AM_CPPFLAGS += -I$(top_srcdir)/ntpq
+
 
 AM_CPPFLAGS  = $(NTP_INCS)
+AM_CPPFLAGS += -I$(top_srcdir)/ntpq
 #AM_CPPFLAGS += -I$(top_srcdir)/sntp
 #AM_CPPFLAGS += -I$(top_srcdir)/ntpd
 #AM_CPPFLAGS += -I$(top_srcdir)/tests/libntp
@@ -45,19 +45,15 @@ AM_CPPFLAGS += -I$(top_srcdir)/sntp/unity
 
 AM_LDFLAGS = $(LDFLAGS_NTP)
 
-tests_SOURCES = $(top_srcdir)/sntp/tests_main.cpp      \
-               t-ntp_signd.c           \
+tests_SOURCES = t-ntpq.c               \
                $(NULL)
 
 BUILT_SOURCES +=                       \
-       $(srcdir)/run-rc_cmdlength.c            \
-       $(srcdir)/run-t-ntp_signd.c             \
+       $(srcdir)/run-t-ntpq.c          \
        $(NULL)
 
-noinst_HEADERS =       g_ntpdtest.h            \
-                       $(srcdir)/../libntp/test-libntp.h       \
-                       $(srcdir)/../libntp/sockaddrtest.h      \
-                       $(NULL)
+noinst_HEADERS =       \
+               $(NULL)
 
 ###
 test_ntpq_CFLAGS =                     \
@@ -77,7 +73,6 @@ $(srcdir)/run-t-ntpq.c: $(srcdir)/t-ntpq.c $(std_unity_list)
        $(run_unity) t-ntpq.c run-t-ntpq.c
 
 
-
 TESTS =
 
 if !NTP_CROSSCOMPILE
@@ -110,8 +105,6 @@ check-libunity: ../../sntp/unity/libunity.a
 ../../sntp/unity/libunity.a:
        cd ../../sntp/unity && $(MAKE) $(AM_MAKEFLAGS) libunity.a
 
-$(top_builddir)/ntpd/ntpdsim-ntp_prio_q.o:
-       cd ../../ntpd/ && $(MAKE) $(AM_MAKEFLAGS) ntpdsim-ntp_prio_q.o
 
 include $(top_srcdir)/depsver.mf
 include $(top_srcdir)/includes.mf

diff --git a/tests/ntpq/t-ntpq.c b/tests/ntpq/t-ntpq.c
index f64e7287ff8cd8c279ad364f81be4c3883ff1f79..c390ddb63633b37a0798bb57e75a0c3336bfc48b 100644 (file)
--- a/tests/ntpq/t-ntpq.c
+++ b/tests/ntpq/t-ntpq.c
@@ -4,7 +4,7 @@
 #include "ntp_stdlib.h"
 
 #include "unity.h"
-
+#include "ntpq.h"
 
 void testPrimary(void);