From: Harlan Stenn <stenn@ntp.org>
Date: Sun, 3 May 2015 02:43:24 +0000 (+0000)
Subject: Updates for bug-2803/ tests
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=476ea114e16cc9bc54b4dcdeb2f20eee9c5eeb50;p=thirdparty%2Fntp.git

Updates for bug-2803/ tests

bk: 55458b4cTVU7LMZVdcyRtFT-NaK39Q
---

diff --git a/configure.ac b/configure.ac
index 035a53b1d..d259aeb03 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4386,6 +4386,7 @@ AC_CONFIG_FILES([scripts/plot_summary],	[chmod +x scripts/plot_summary])
 AC_CONFIG_FILES([scripts/summary],	[chmod +x scripts/summary])
 AC_CONFIG_FILES([scripts/update-leap/Makefile])
 AC_CONFIG_FILES([tests/Makefile])
+AC_CONFIG_FILES([tests/bug-2803/Makefile])
 AC_CONFIG_FILES([tests/libntp/Makefile])
 AC_CONFIG_FILES([tests/ntpd/Makefile])
 AC_CONFIG_FILES([util/Makefile])
diff --git a/tests/Makefile.am b/tests/Makefile.am
index a7d7c3c7e..95b253b4a 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -7,3 +7,6 @@ SUBDIRS +=	libntp	\
 		$(NULL)
 endif
 
+SUBDIRS +=	bug-2803	\
+		$(NULL)
+
diff --git a/tests/bug-2803/Makefile.am b/tests/bug-2803/Makefile.am
new file mode 100644
index 000000000..d0ad58feb
--- /dev/null
+++ b/tests/bug-2803/Makefile.am
@@ -0,0 +1,54 @@
+AUTOMAKE_OPTIONS = foreign 1.9 subdir-objects
+NULL =
+BUILT_SOURCES =
+CLEANFILES =
+
+check_PROGRAMS = bug-2803
+
+# HMS: we may not need some of these:
+LDADD =					\
+	$(top_builddir)/libntp/libntp.a	\
+	$(LDADD_LIBNTP)			\
+	$(PTHREAD_LIBS)			\
+	$(LDADD_NTP)			\
+	$(NULL)
+
+AM_CFLAGS   = $(CFLAGS_NTP)
+
+# HMS: we may not need some of these:
+AM_CPPFLAGS  = $(NTP_INCS)
+AM_CPPFLAGS += -I$(top_srcdir)/sntp
+AM_CPPFLAGS += -I$(top_srcdir)/sntp/unity
+AM_CPPFLAGS += -I$(top_srcdir)/ntpd
+AM_CPPFLAGS += $(CPPFLAGS_NTP)
+
+AM_LDFLAGS = $(LDFLAGS_NTP)
+
+tests_SOURCES = $(top_srcdir)/sntp/unity/unity.c	\
+		bug-2803.c				\
+		$(NULL)
+
+# HMS: we may not need some of these:
+#noinst_HEADERS =	ntpdtest.h	\
+#			$(NULL)
+
+TESTS =
+
+if !NTP_CROSSCOMPILE
+TESTS += $(CHECK_PROGRAMS)
+endif
+
+## check-libntp.mf - automake fragment
+## slightly adapted for deeper directory
+
+BUILT_SOURCES	+= check-libntp
+CLEANFILES	+= check-libntp
+
+check-libntp: ../../libntp/libntp.a
+	@echo stamp > $@
+
+../../libntp/libntp.a:
+	cd ../../libntp && $(MAKE) $(AM_MAKEFLAGS) libntp.a
+
+include $(top_srcdir)/depsver.mf
+include $(top_srcdir)/includes.mf