[Opendnssec-commits] [keihatsu.kirei.se/svn/dnssec] r3811 - in trunk/OpenDNSSEC: . enforcer enforcer/test enforcer/test/cucumber enforcer/test/cunit

Jakob Schlyter jakob at kirei.se
Thu Aug 26 17:05:19 CEST 2010


Author: jakob
Date: 2010-08-26 17:05:19 +0200 (Thu, 26 Aug 2010)
New Revision: 3811

Added:
   trunk/OpenDNSSEC/enforcer/test/cucumber/Makefile.am
   trunk/OpenDNSSEC/enforcer/test/cunit/
   trunk/OpenDNSSEC/enforcer/test/cunit/Makefile.am
   trunk/OpenDNSSEC/enforcer/test/cunit/database_setup_mysql.sh.in
   trunk/OpenDNSSEC/enforcer/test/cunit/database_setup_sqlite3.sh.in
   trunk/OpenDNSSEC/enforcer/test/cunit/test.c
   trunk/OpenDNSSEC/enforcer/test/cunit/test_database.c
   trunk/OpenDNSSEC/enforcer/test/cunit/test_datetime.c
   trunk/OpenDNSSEC/enforcer/test/cunit/test_dd_string.c
   trunk/OpenDNSSEC/enforcer/test/cunit/test_di_string.c
   trunk/OpenDNSSEC/enforcer/test/cunit/test_dq_string.c
   trunk/OpenDNSSEC/enforcer/test/cunit/test_du_string.c
   trunk/OpenDNSSEC/enforcer/test/cunit/test_keyword.c
   trunk/OpenDNSSEC/enforcer/test/cunit/test_ksm_import.c
   trunk/OpenDNSSEC/enforcer/test/cunit/test_ksm_key.c
   trunk/OpenDNSSEC/enforcer/test/cunit/test_ksm_key_delete.c
   trunk/OpenDNSSEC/enforcer/test/cunit/test_ksm_keyword.c
   trunk/OpenDNSSEC/enforcer/test/cunit/test_ksm_parameter.c
   trunk/OpenDNSSEC/enforcer/test/cunit/test_ksm_policy.c
   trunk/OpenDNSSEC/enforcer/test/cunit/test_ksm_purge.c
   trunk/OpenDNSSEC/enforcer/test/cunit/test_ksm_request.c
   trunk/OpenDNSSEC/enforcer/test/cunit/test_ksm_update.c
   trunk/OpenDNSSEC/enforcer/test/cunit/test_ksm_zone.c
   trunk/OpenDNSSEC/enforcer/test/cunit/test_message.c
   trunk/OpenDNSSEC/enforcer/test/cunit/test_routines.c
   trunk/OpenDNSSEC/enforcer/test/cunit/test_routines.h
   trunk/OpenDNSSEC/enforcer/test/cunit/test_routines_cunit.c
   trunk/OpenDNSSEC/enforcer/test/cunit/test_routines_database.c
   trunk/OpenDNSSEC/enforcer/test/cunit/test_string_util.c
   trunk/OpenDNSSEC/enforcer/test/cunit/test_string_util2.c
Removed:
   trunk/OpenDNSSEC/enforcer/test/Makefile.am
   trunk/OpenDNSSEC/enforcer/test/database_setup_mysql.sh.in
   trunk/OpenDNSSEC/enforcer/test/database_setup_sqlite3.sh.in
   trunk/OpenDNSSEC/enforcer/test/test.c
   trunk/OpenDNSSEC/enforcer/test/test_database.c
   trunk/OpenDNSSEC/enforcer/test/test_datetime.c
   trunk/OpenDNSSEC/enforcer/test/test_dd_string.c
   trunk/OpenDNSSEC/enforcer/test/test_di_string.c
   trunk/OpenDNSSEC/enforcer/test/test_dq_string.c
   trunk/OpenDNSSEC/enforcer/test/test_du_string.c
   trunk/OpenDNSSEC/enforcer/test/test_keyword.c
   trunk/OpenDNSSEC/enforcer/test/test_ksm_import.c
   trunk/OpenDNSSEC/enforcer/test/test_ksm_key.c
   trunk/OpenDNSSEC/enforcer/test/test_ksm_key_delete.c
   trunk/OpenDNSSEC/enforcer/test/test_ksm_keyword.c
   trunk/OpenDNSSEC/enforcer/test/test_ksm_parameter.c
   trunk/OpenDNSSEC/enforcer/test/test_ksm_policy.c
   trunk/OpenDNSSEC/enforcer/test/test_ksm_purge.c
   trunk/OpenDNSSEC/enforcer/test/test_ksm_request.c
   trunk/OpenDNSSEC/enforcer/test/test_ksm_update.c
   trunk/OpenDNSSEC/enforcer/test/test_ksm_zone.c
   trunk/OpenDNSSEC/enforcer/test/test_message.c
   trunk/OpenDNSSEC/enforcer/test/test_routines.c
   trunk/OpenDNSSEC/enforcer/test/test_routines.h
   trunk/OpenDNSSEC/enforcer/test/test_routines_cunit.c
   trunk/OpenDNSSEC/enforcer/test/test_routines_database.c
   trunk/OpenDNSSEC/enforcer/test/test_string_util.c
   trunk/OpenDNSSEC/enforcer/test/test_string_util2.c
Modified:
   trunk/OpenDNSSEC/configure.ac
   trunk/OpenDNSSEC/enforcer/Makefile.am
Log:
- look for cucumber
- move cunit tests down one level
- add skeleton for cucumber-based enforcer tests


Modified: trunk/OpenDNSSEC/configure.ac
===================================================================
--- trunk/OpenDNSSEC/configure.ac	2010-08-26 14:47:47 UTC (rev 3810)
+++ trunk/OpenDNSSEC/configure.ac	2010-08-26 15:05:19 UTC (rev 3811)
@@ -230,6 +230,10 @@
 fi
 AM_CONDITIONAL([ENABLE_EPPCLIENT], [test "${enable_eppclient}" = "yes"])
 
+# check for a green cucumber
+AC_PATH_PROG(CUCUMBER, cucumber)
+AM_CONDITIONAL([WITH_CUCUMBER], [test -x "${CUCUMBER}"])
+
 # doxygen
 DX_PDF_FEATURE(OFF)
 DX_PS_FEATURE(OFF)
@@ -258,8 +262,10 @@
 	enforcer/utils/Makefile
 	enforcer/utils/ods-ksmutil.1
 	enforcer/test/Makefile
-	enforcer/test/database_setup_mysql.sh
-	enforcer/test/database_setup_sqlite3.sh
+	enforcer/test/cucumber/Makefile
+	enforcer/test/cunit/Makefile
+	enforcer/test/cunit/database_setup_mysql.sh
+	enforcer/test/cunit/database_setup_sqlite3.sh
 	libhsm/Makefile
 	libhsm/src/Makefile
 	libhsm/src/ods-hsmspeed.1

Modified: trunk/OpenDNSSEC/enforcer/Makefile.am
===================================================================
--- trunk/OpenDNSSEC/enforcer/Makefile.am	2010-08-26 14:47:47 UTC (rev 3810)
+++ trunk/OpenDNSSEC/enforcer/Makefile.am	2010-08-26 15:05:19 UTC (rev 3811)
@@ -2,12 +2,8 @@
 
 MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
 
-SUBDIRS = ksm common enforcerd utils 
+SUBDIRS = ksm common enforcerd utils test
 
-if WITH_CUNIT
-SUBDIRS += test
-endif
-
 doxygen:
 	rm -fr $(top_builddir)/enforcer/doxygen-doc
 	env $(DX_ENV) \




More information about the Opendnssec-commits mailing list