Merge psp-deb1.ntp.org:/home/stenn/ntp-stable-unity/

into  ubuntu.(none):/home/viperus/Desktop/ntp-stable-unity

bk: 55b76b64Z5MxRPrFZjyTi5MIVNjOZw

diff --cc tests/ntpd/Makefile.am
index fd4150fb7ed061aabddcefb424127d72069801bb,25cfe066559f822dbe7d53fbf54168c539b3788e..c9430efcd4bc96b908bc688fdcf4eeb2a0291926
--- 1/tests/ntpd/Makefile.am
--- 2/tests/ntpd/Makefile.am
+++ b/tests/ntpd/Makefile.am
@@@ -10,11 -10,12 +10,14 @@@ run_unity =        cd $(srcdir) && ruby ../../
  
  check_PROGRAMS =              \
        test-leapsec            \
-       test-rc_cmdlength   \
 +      test-ntp_prio_q         \
 +      test-ntp_restrict       \
+       test-rc_cmdlength       \
+       test-ntp_scanner        \
        $(NULL)
  
+ #     test-ntp_signd          \ #doesn't work, can't link it because you can't link static function
+ 
  if GTEST_AVAILABLE
  check_PROGRAMS += tests
  else
@@@ -54,17 -55,15 +57,19 @@@ AM_LDFLAGS = $(LDFLAGS_NTP
  tests_SOURCES = $(top_srcdir)/sntp/tests_main.cpp     \
                g_ntpdtest.cpp          \
                $(top_srcdir)/ntpd/ntp_leapsec.c        \
 +              $(top_srcdir)/ntpd/ntp_prio_q.c         \
 +              $(top_srcdir)/ntpd/ntp_restrict.c       \
                $(top_srcdir)/ntpd/rc_cmdlength.c       \
+               $(top_srcdir)/ntpd/ntp_signd.c  \
                g_leapsec.cpp   \
                $(NULL)
  
  BUILT_SOURCES +=                      \
        $(srcdir)/run-leapsec.c         \
 +      $(srcdir)/run-ntp_prio_q.c      \
 +      $(srcdir)/run-ntp_restrict.c    \
        $(srcdir)/run-rc_cmdlength.c            \
+       $(srcdir)/run-ntp_signd.c               \
        $(NULL)
  
  noinst_HEADERS =      g_ntpdtest.h            \
@@@ -148,8 -107,47 +153,48 @@@ test_rc_cmdlength_SOURCES =                      
  $(srcdir)/run-rc_cmdlength.c: $(srcdir)/rc_cmdlength.c $(std_unity_list)
        $(run_unity) rc_cmdlength.c run-rc_cmdlength.c
  
+ ###
+ test_ntp_signd_CFLAGS =                       \
+       -I$(top_srcdir)/sntp/unity      \
+       $(NULL)
+ 
+ test_ntp_signd_LDADD =                        \
+       $(unity_tests_LDADD)            \
+       $(top_builddir)/ntpd/libntpd.a  \
+       $(top_builddir)/ntpd/ntp_signd.o        \
+       $(unity_tests_LDADD)            \
+       $(NULL)
+ 
+ test_ntp_signd_SOURCES =                      \
+       ntp_signd.c                     \
+       run-ntp_signd.c                 \
+       $(srcdir)/../libntp/test-libntp.c               \
+       $(NULL)
+ 
+ $(srcdir)/run-ntp_signd.c: $(srcdir)/ntp_signd.c $(std_unity_list)
+       $(run_unity) ntp_signd.c run-ntp_signd.c
+ 
+ ###
+ test_ntp_scanner_CFLAGS =                     \
+       -I$(top_srcdir)/sntp/unity      \
+       $(NULL)
+ 
+ test_ntp_scanner_LDADD =                      \
+       $(unity_tests_LDADD)            \
+       $(top_builddir)/ntpd/ntp_scanner.o              \
+       $(NULL)
+ 
+ test_ntp_scanner_SOURCES =                    \
+       ntp_scanner.c                           \
+       run-ntp_scanner.c                       \
+       $(srcdir)/../libntp/test-libntp.c       \
+       $(NULL)
+ 
+ $(srcdir)/run-ntp_scanner.c: $(srcdir)/ntp_scanner.c $(std_unity_list)
+       $(run_unity) ntp_scanner.c run-ntp_scanner.c
+ 
  
 +
  TESTS =
  
  if !NTP_CROSSCOMPILE