[svn] commit: r2255 - in /branches/tingting-loadzone/src/bin/loadzone: Makefile.am tests/correct/Makefile.am tests/correct/correct_test.sh.in tests/error/Makefile.am tests/error/error_test.sh.in tests/error/nofilenane.db

[BIND 10 source code commits]

Author: shentingting
Date: Thu Jun 24 06:33:44 2010
New Revision: 2255

Log:
add two Makefile.am files to make the test more quick. now we can use make check to run the tests.

Added:
    branches/tingting-loadzone/src/bin/loadzone/tests/correct/Makefile.am   (with props)
    branches/tingting-loadzone/src/bin/loadzone/tests/error/Makefile.am   (with props)
Removed:
    branches/tingting-loadzone/src/bin/loadzone/tests/error/nofilenane.db
Modified:
    branches/tingting-loadzone/src/bin/loadzone/Makefile.am
    branches/tingting-loadzone/src/bin/loadzone/tests/correct/correct_test.sh.in
    branches/tingting-loadzone/src/bin/loadzone/tests/error/error_test.sh.in

Modified: branches/tingting-loadzone/src/bin/loadzone/Makefile.am
==============================================================================
--- branches/tingting-loadzone/src/bin/loadzone/Makefile.am (original)
+++ branches/tingting-loadzone/src/bin/loadzone/Makefile.am Thu Jun 24 06:33:44 2010
@@ -1,3 +1,5 @@
+SUBDIRS = tests/correct
+SUBDIRS += tests/error
 bin_SCRIPTS = b10-loadzone
 
 CLEANFILES = b10-loadzone
@@ -21,3 +23,28 @@
 install-data-local:
 	$(mkinstalldirs) $(DESTDIR)/@localstatedir@/@PACKAGE@
 # TODO: permissions handled later
+
+EXTRA_DIST += tests/normal/README
+EXTRA_DIST += tests/normal/dsset-subzone.example.com.
+EXTRA_DIST += tests/normal/example.com
+EXTRA_DIST += tests/normal/example.com.signed
+EXTRA_DIST += tests/normal/Kexample.com.+005+04456.key
+EXTRA_DIST += tests/normal/Kexample.com.+005+04456.private
+EXTRA_DIST += tests/normal/Kexample.com.+005+33495.key
+EXTRA_DIST += tests/normal/Kexample.com.+005+33495.private
+EXTRA_DIST += tests/normal/Ksql1.example.com.+005+12447.key
+EXTRA_DIST += tests/normal/Ksql1.example.com.+005+12447.private
+EXTRA_DIST += tests/normal/Ksql1.example.com.+005+33313.key
+EXTRA_DIST += tests/normal/Ksql1.example.com.+005+33313.private
+EXTRA_DIST += tests/normal/Ksql2.example.com.+005+38482.key
+EXTRA_DIST += tests/normal/Ksql2.example.com.+005+38482.private
+EXTRA_DIST += tests/normal/Ksql2.example.com.+005+63192.key
+EXTRA_DIST += tests/normal/Ksql2.example.com.+005+63192.private
+EXTRA_DIST += tests/normal/sql1.example.com
+EXTRA_DIST += tests/normal/sql1.example.com.signed
+EXTRA_DIST += tests/normal/sql2.example.com
+EXTRA_DIST += tests/normal/sql2.example.com.signed
+
+pytest:
+	$(SHELL) tests/correct/correct_test.sh
+	$(SHELL) tests/error/error_test.sh

Modified: branches/tingting-loadzone/src/bin/loadzone/tests/correct/correct_test.sh.in
==============================================================================
--- branches/tingting-loadzone/src/bin/loadzone/tests/correct/correct_test.sh.in (original)
+++ branches/tingting-loadzone/src/bin/loadzone/tests/correct/correct_test.sh.in Thu Jun 24 06:33:44 2010
@@ -24,6 +24,7 @@
 LOADZONE_PATH=@abs_top_srcdir@/src/bin/loadzone
 status=0
 echo "Loadzone include. from include.db file"
+cd ${LOADZONE_PATH}/tests/correct
 ${LOADZONE_PATH}/b10-loadzone -d zone.sqlite3 include.db >> /dev/null
 
 echo "loadzone  ttl1. from ttl1.db file"
@@ -53,7 +54,15 @@
 diff test.out known.test.out || status=1
 
 echo "Clean tmp files."
-rm -f ./zone.sqlite3
+rm -f zone.sqlite3
 rm -f test.out
 echo "I:exit status: $status"
+echo "------------------------------------------------------------------------------"
+echo "Ran 6 test files"
+echo ""
+if [ "$status" -eq 1 ] ;then
+    echo "ERROR"
+else
+    echo "OK"
+fi
 exit $status

Modified: branches/tingting-loadzone/src/bin/loadzone/tests/error/error_test.sh.in
==============================================================================
--- branches/tingting-loadzone/src/bin/loadzone/tests/error/error_test.sh.in (original)
+++ branches/tingting-loadzone/src/bin/loadzone/tests/error/error_test.sh.in Thu Jun 24 06:33:44 2010
@@ -24,6 +24,7 @@
 LOADZONE_PATH=@abs_top_srcdir@/src/bin/loadzone
 export LOADZONE_PATH
 status=0
+cd ${LOADZONE_PATH}/tests/error
 
 echo "Test no \$ORIGIN error in zone file"
 ${LOADZONE_PATH}/b10-loadzone originerr1.db 1> /dev/null 2> error.out
@@ -59,7 +60,15 @@
 diff error.out error.known || status=1
 
 echo "Clean tmp file."
-rm -f ./error.out
+rm -f error.out
 
 echo "I:exit status:$status"
+echo "-----------------------------------------------------------------------------"
+echo "Ran 11 test files"
+echo ""
+if [ "$status" -eq 1 ];then
+    echo "ERROR"
+else 
+    echo "OK"
+fi
 exit $status