[svn] commit: r1260 - in /trunk/src/lib/auth: ./ testdata/ tests/ tests/testdata/

[BIND 10 source code commits]

Author: each
Date: Wed Mar 10 04:19:35 2010
New Revision: 1260

Log:
Restructured src/lib/auth:
 - test-related files are now in "tests"
 - concrete data sources are now named "sqlite3_ds.h" and "static_ds.h",
   so we don't have so many files all starting with "data_source".

Added:
    trunk/src/lib/auth/sqlite3_ds.cc
      - copied, changed from r1259, trunk/src/lib/auth/data_source_sqlite3.cc
    trunk/src/lib/auth/sqlite3_ds.h
      - copied unchanged from r1259, trunk/src/lib/auth/data_source_sqlite3.h
    trunk/src/lib/auth/static_ds.cc
      - copied, changed from r1259, trunk/src/lib/auth/data_source_static.cc
    trunk/src/lib/auth/static_ds.h
      - copied unchanged from r1259, trunk/src/lib/auth/data_source_static.h
    trunk/src/lib/auth/tests/
    trunk/src/lib/auth/tests/datasrc_unittest.cc
      - copied, changed from r1259, trunk/src/lib/auth/datasrc_unittest.cc
    trunk/src/lib/auth/tests/run_unittests.cc
      - copied unchanged from r1259, trunk/src/lib/auth/run_unittests.cc
    trunk/src/lib/auth/tests/sqlite3_ds_unittest.cc
      - copied, changed from r1259, trunk/src/lib/auth/data_source_sqlite3_unittest.cc
    trunk/src/lib/auth/tests/static_ds_unittest.cc
      - copied, changed from r1259, trunk/src/lib/auth/data_source_static_unittest.cc
    trunk/src/lib/auth/tests/test_ds.cc
      - copied, changed from r1259, trunk/src/lib/auth/unittest_ds.cc
    trunk/src/lib/auth/tests/test_ds.h
      - copied, changed from r1259, trunk/src/lib/auth/unittest_ds.h
    trunk/src/lib/auth/tests/testdata/
      - copied from r1259, trunk/src/lib/auth/testdata/
    trunk/src/lib/auth/tests/unittest_util.cc
      - copied unchanged from r1259, trunk/src/lib/auth/unittest_util.cc
    trunk/src/lib/auth/tests/unittest_util.h
      - copied unchanged from r1259, trunk/src/lib/auth/unittest_util.h
Removed:
    trunk/src/lib/auth/data_source_sqlite3.cc
    trunk/src/lib/auth/data_source_sqlite3.h
    trunk/src/lib/auth/data_source_sqlite3_unittest.cc
    trunk/src/lib/auth/data_source_static.cc
    trunk/src/lib/auth/data_source_static.h
    trunk/src/lib/auth/data_source_static_unittest.cc
    trunk/src/lib/auth/datasrc_unittest.cc
    trunk/src/lib/auth/run_unittests.cc
    trunk/src/lib/auth/testdata/
    trunk/src/lib/auth/unittest_ds.cc
    trunk/src/lib/auth/unittest_ds.h
    trunk/src/lib/auth/unittest_util.cc
    trunk/src/lib/auth/unittest_util.h
Modified:
    trunk/src/lib/auth/Makefile.am

Modified: trunk/src/lib/auth/Makefile.am
==============================================================================
--- trunk/src/lib/auth/Makefile.am (original)
+++ trunk/src/lib/auth/Makefile.am Wed Mar 10 04:19:35 2010
@@ -1,30 +1,11 @@
+SUBDIRS = . tests
+
 AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/ext $(SQLITE_CFLAGS)
 
 CLEANFILES = *.gcno *.gcda
 
 lib_LTLIBRARIES = libauth.la
 libauth_la_SOURCES = data_source.h data_source.cc
-libauth_la_SOURCES += data_source_static.h data_source_static.cc
-libauth_la_SOURCES += data_source_sqlite3.h data_source_sqlite3.cc
+libauth_la_SOURCES += static_ds.h static_ds.cc
+libauth_la_SOURCES += sqlite3_ds.h sqlite3_ds.cc
 libauth_la_SOURCES += query.h query.cc
-
-TESTS =
-if HAVE_GTEST
-TESTS += run_unittests
-run_unittests_SOURCES = run_unittests.cc
-run_unittests_SOURCES += unittest_util.h unittest_util.cc
-run_unittests_SOURCES += unittest_ds.h unittest_ds.cc
-run_unittests_SOURCES += datasrc_unittest.cc
-run_unittests_SOURCES += data_source_sqlite3_unittest.cc
-run_unittests_SOURCES += data_source_static_unittest.cc
-run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
-run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)
-run_unittests_LDADD = $(GTEST_LDADD)
-run_unittests_LDADD += $(SQLITE_LIBS)
-run_unittests_LDADD += .libs/libauth.a
-run_unittests_LDADD += $(top_builddir)/src/lib/dns/.libs/libdns.a 
-run_unittests_LDADD += $(top_builddir)/src/lib/cc/libcc.a 
-run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/.libs/libexceptions.a
-endif
-
-noinst_PROGRAMS = $(TESTS)