[ntp:bk-ntp-dev-send] BitKeeper diffs

stenn at whimsy.udel.edu stenn at whimsy.udel.edu
Mon Jul 22 09:03:16 UTC 2013


#### ChangeSet ####
2013-06-28 13:18:15-04:00, karlsson at psp-deb1.ntp.org
  [Bug 2413] make check fails to run tests with automake >= 1.13

==== BitKeeper/deleted/31/test-driver~38cbd0dac650aed0 ====
2013-06-28 13:12:36-04:00, karlsson at psp-deb1.ntp.org +0 -0
  Delete: sntp/tests/test-driver

==== ChangeLog ====
2013-06-28 13:16:57-04:00, karlsson at psp-deb1.ntp.org +1 -0
  [Bug 2413] make check fails to run tests with automake >= 1.13

--- 1.1296/ChangeLog	2013-05-01 07:35:16 -04:00
+++ 1.1297/ChangeLog	2013-06-28 13:16:57 -04:00
@@ -1,3 +1,4 @@
+* [Bug 2413] make check fails to run tests with automake >= 1.13
 (4.2.7p368) 2013/05/01 Released by Harlan Stenn <stenn at ntp.org>
 * [Bug 2145] ntpq dumps core when displaying sys_var_list and more.
 (4.2.7p367) 2013/04/25 Released by Harlan Stenn <stenn at ntp.org>

==== sntp/tests/Makefile.am ====
2013-06-28 13:15:50-04:00, karlsson at psp-deb1.ntp.org +2 -7
  [Bug 2413] make check fails to run tests with automake >= 1.13

--- 1.27/sntp/tests/Makefile.am	2012-04-09 01:25:11 -04:00
+++ 1.28/sntp/tests/Makefile.am	2013-06-28 13:15:50 -04:00
@@ -27,7 +27,7 @@ noinst_HEADERS =		\
 	fileHandlingTest.h	\
 	$(NULL)
 
-dist_check_SCRIPTS =	test-driver
+dist_check_SCRIPTS =	tests-runner
 
 EXTRA_DIST =				\
 	data/debug-input-lfp-bin	\
@@ -80,13 +80,8 @@ AM_LDFLAGS = $(LDFLAGS_NTP)
 
 TESTS = 
 
-TEST_INPUT_DIR = $(abs_srcdir)/data
-TEST_OUTPUT_DIR = $(abs_builddir)/data
-
-TESTS_ENVIRONMENT = $(top_srcdir)/tests/test-driver $(TEST_INPUT_DIR) $(TEST_OUTPUT_DIR)
-
 if !NTP_CROSSCOMPILE
-TESTS += $(check_PROGRAMS)
+TESTS += tests-runner
 endif
 
 ## ensure ../libsntp.a is built

==== sntp/tests/tests-runner ====
2013-06-28 13:13:51-04:00, karlsson at psp-deb1.ntp.org +13 -0
  BitKeeper file /home/karlsson/2413/ntp-dev-2413/sntp/tests/tests-runner

--- /dev/null	2013-07-22 05:03:13 -04:00
+++ 1.1/sntp/tests/tests-runner	2013-06-28 13:13:51 -04:00
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+# $builddir is always .
+builddir=.
+# $srcdir will be set to the correct directory when this script is called from
+# the Makefiles generated by Automake.
+
+# Create output directory.
+mkdir -p $builddir/data
+
+# Test executable expects two arguments: test_input_dir and test_output_dir.
+./tests $srcdir/data $builddir/data
+

==== sntp/tests/tests-runner ====
2013-06-28 13:13:51-04:00, karlsson at psp-deb1.ntp.org +0 -0


More information about the bk-ntp-dev-send mailing list