[v9_8]

3538.	[test]	Running "make test" now requires loopback interfaces to be
	set up. [RT #32452]

diff --git a/CHANGES b/CHANGES
index 0d4e29ba77e72e00f04f5ca86a4ef766d435d883..6f1fb0b954738b386fca7665066626df6f209616 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+3538.  [test]  Running "make test" now requires loopback interfaces to be 
+                       set up. [RT #32452]
+
 3537.  [tuning]        Slave zones, when updated, now send NOTIFY messages
                        to peers before being dumped to disk rather than
                        after. [RT #27242]

diff --git a/Makefile.in b/Makefile.in
index 05d9c43174f02f58525718741bb92629ecf307ce..1ea120d01a601cdff567d5f8d3608d1f4f71e623 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -61,9 +61,21 @@ tags:
        rm -f TAGS
        find lib bin -name "*.[ch]" -print | @ETAGS@ -
 
-check: test
-
 test:
+       @if test -n "`${PERL} ${top_srcdir}/bin/tests/system/testsock.pl 2>&- || echo fail`"; then \
+       echo I: NOTE: The tests were not run because they require that; \
+       echo I: the IP addresses 10.53.0.1 through 10.53.0.8 are configured; \
+       echo I: as alias addresses on the loopback interface.  Please run; \
+       echo I: \'bin/tests/system/ifconfig.sh up\' as root to configure; \
+       echo I: them, then rerun the tests. Run make force-test to run the; \
+       echo I: tests anyway.; \
+       exit 1; \
+       fi
+       ${MAKE} test-force
+
+force-test: test-force
+
+test-force:
        status=0; \
        (cd bin/tests && ${MAKE} ${MAKEDEFS} test) || status=1; \
        (test -f unit/unittest.sh && $(SHELL) unit/unittest.sh) || status=1; \