README for new test setup and testbound selftest.

git-svn-id: file:///svn/unbound/trunk@2215 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/Makefile.in b/Makefile.in
index aabd0f118786c1196604487cf4960e5f93bb034c..e9926fcb1d5da80af6b65a4df9eb2f27a3bbe80f 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -199,6 +199,7 @@ longcheck: longtest
 
 test:  unittest$(EXEEXT) testbound$(EXEEXT)
        ./unittest$(EXEEXT)
+       ./testbound$(EXEEXT) -s
        for x in testdata/*.rpl; do if ./testbound$(EXEEXT) -p $$x >/dev/null 2>&1; then echo $$x OK; else echo $$x failed; exit 1; fi done
        @echo test OK
 

diff --git a/doc/README b/doc/README
index 524d89b39948e3588c0f6c0ea4967231fc39203e..523132faa593dc6d4ca899424697e915ce401bd7 100644 (file)
--- a/doc/README
+++ b/doc/README
@@ -72,8 +72,7 @@ This software is under BSD license, see LICENSE for details.
   * --disable-gost
        Disable support for GOST crypto, RFC 5933.
 
-* 'make test' attempts to run a series of tests, depending on the support
-  programs that are installed.
+* 'make test' runs a series of self checks.
 
 Known issues
 ------------

diff --git a/doc/README.tests b/doc/README.tests
index 3999558978d232d6eb505a68bbde3f4eb7545e41..5385e2b2221f7537a77bdad78988d65bee983261 100644 (file)
--- a/doc/README.tests
+++ b/doc/README.tests
@@ -1,8 +1,11 @@
 README unbound tests
 
-There is a test setup for unbound. Use
+For a quick test that runs unit tests and state machine tests, use
        make test
-To make and run the tests. The results are summarized at the end.
+
+There is a long test setup for unbound that needs tools installed. Use
+       make longtest
+To make and run the long tests. The results are summarized at the end.
 
 You need to have the following programs installed and in your PATH.
 * dig - from the bind-tools package. Used to send DNS queries.
@@ -12,10 +15,6 @@ You need to have the following programs installed and in your PATH.
 * xxd and nc (optional) - for (malformed) packet transmission.
 The optional programs are detected and can be omitted.
 
-Without any support programs, unittest and testbound can still be used.
-       (cd testdata; ../testcode/mini_tpkg.sh exe 02-unittest.tpkg)
-       (cd testdata; ../testcode/mini_tpkg.sh exe 03-testbound.tpkg)
-
 testdata/ contains the data for tests. 
 testcode/ contains scripts and c code for the tests.