[svn] commit: r1923 - in /branches/tingting-loadzone: configure.ac src/bin/auth/Makefile.am src/bin/loadzone/Makefile.am src/bin/loadzone/tests/correct/ttl2.db

[BIND 10 source code commits]

Author: shentingting
Date: Wed May 26 02:27:00 2010
New Revision: 1923

Log:
use @builddir@/src/bin/loadzone/b10-loadzone instead of just b10-loadzone in path

Modified:
    branches/tingting-loadzone/configure.ac
    branches/tingting-loadzone/src/bin/auth/Makefile.am
    branches/tingting-loadzone/src/bin/loadzone/Makefile.am
    branches/tingting-loadzone/src/bin/loadzone/tests/correct/ttl2.db

Modified: branches/tingting-loadzone/configure.ac
==============================================================================
--- branches/tingting-loadzone/configure.ac (original)
+++ branches/tingting-loadzone/configure.ac Wed May 26 02:27:00 2010
@@ -424,6 +424,8 @@
            src/bin/bindctl/bindctl-source.py
            src/bin/bindctl/tests/bindctl_test
            src/bin/loadzone/run_loadzone.sh
+           src/bin/loadzone/tests/correct/correct_test.sh
+           src/bin/loadzone/tests/error/error_test.sh
            src/bin/loadzone/b10-loadzone.py
            src/bin/usermgr/run_b10-cmdctl-usermgr.sh
            src/bin/usermgr/b10-cmdctl-usermgr.py
@@ -448,6 +450,8 @@
            chmod +x src/bin/bindctl/tests/bindctl_test
            chmod +x src/bin/bindctl/run_bindctl.sh
            chmod +x src/bin/loadzone/run_loadzone.sh
+           chmod +x src/bin/loadzone/tests/correct/correct_test.sh
+           chmod +x src/bin/loadzone/tests/error/error_test.sh
            chmod +x src/bin/usermgr/run_b10-cmdctl-usermgr.sh
            chmod +x src/bin/msgq/run_msgq.sh
            chmod +x src/bin/msgq/tests/msgq_test

Modified: branches/tingting-loadzone/src/bin/auth/Makefile.am
==============================================================================
--- branches/tingting-loadzone/src/bin/auth/Makefile.am (original)
+++ branches/tingting-loadzone/src/bin/auth/Makefile.am Wed May 26 02:27:00 2010
@@ -36,7 +36,7 @@
 b10_auth_LDADD += $(top_builddir)/src/lib/config/.libs/libcfgclient.a
 b10_auth_LDADD += $(top_builddir)/src/lib/cc/libcc.a
 b10_auth_LDADD += $(top_builddir)/src/lib/exceptions/.libs/libexceptions.a
-b10_auth_LDADD += $(SQLITE_LIBS)
+b10_auth_LDADD += -lsqlite3
 if HAVE_BOOST_SYSTEM
 if HAVE_BOOST_PYTHON
 b10_auth_LDADD += $(top_builddir)/src/lib/xfr/.libs/libxfr.a

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 Wed May 26 02:27:00 2010
@@ -22,23 +22,23 @@
 	$(mkinstalldirs) $(DESTDIR)/@localstatedir@/@PACKAGE@
 # TODO: permissions handled later
 
-EXTRA_DIST += testdata/README
-EXTRA_DIST += testdata/dsset-subzone.example.com.
-EXTRA_DIST += testdata/example.com
-EXTRA_DIST += testdata/example.com.signed
-EXTRA_DIST += testdata/Kexample.com.+005+04456.key
-EXTRA_DIST += testdata/Kexample.com.+005+04456.private
-EXTRA_DIST += testdata/Kexample.com.+005+33495.key
-EXTRA_DIST += testdata/Kexample.com.+005+33495.private
-EXTRA_DIST += testdata/Ksql1.example.com.+005+12447.key
-EXTRA_DIST += testdata/Ksql1.example.com.+005+12447.private
-EXTRA_DIST += testdata/Ksql1.example.com.+005+33313.key
-EXTRA_DIST += testdata/Ksql1.example.com.+005+33313.private
-EXTRA_DIST += testdata/Ksql2.example.com.+005+38482.key
-EXTRA_DIST += testdata/Ksql2.example.com.+005+38482.private
-EXTRA_DIST += testdata/Ksql2.example.com.+005+63192.key
-EXTRA_DIST += testdata/Ksql2.example.com.+005+63192.private
-EXTRA_DIST += testdata/sql1.example.com
-EXTRA_DIST += testdata/sql1.example.com.signed
-EXTRA_DIST += testdata/sql2.example.com
-EXTRA_DIST += testdata/sql2.example.com.signed
+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

Modified: branches/tingting-loadzone/src/bin/loadzone/tests/correct/ttl2.db
==============================================================================
--- branches/tingting-loadzone/src/bin/loadzone/tests/correct/ttl2.db (original)
+++ branches/tingting-loadzone/src/bin/loadzone/tests/correct/ttl2.db Wed May 26 02:27:00 2010
@@ -11,7 +11,7 @@
 a			TXT	"inherited ttl 1"
 b		2	TXT	"explicit ttl 2"
 c			TXT	"inherited ttl 2"
-$TTL 3
+$TTL 3    ; a new ttl
 d			TXT	"default ttl 3"
 e		2	TXT	"explicit ttl 2"
 f			TXT	"default ttl 3"