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

Jakob Schlyter jakob at kirei.se
Tue Aug 10 23:10:25 CEST 2010


Author: jakob
Date: 2010-08-10 23:10:25 +0200 (Tue, 10 Aug 2010)
New Revision: 3717

Added:
   trunk/OpenDNSSEC/enforcer/test/database_setup_mysql.sh.in
   trunk/OpenDNSSEC/enforcer/test/database_setup_sqlite3.sh.in
Removed:
   trunk/OpenDNSSEC/enforcer/test/database_setup.sh
   trunk/OpenDNSSEC/enforcer/test/database_setup_lite.sh
Modified:
   trunk/OpenDNSSEC/configure.ac
   trunk/OpenDNSSEC/enforcer/test/test_routines_database.c
Log:
CUnit test scripts cleanup

Modified: trunk/OpenDNSSEC/configure.ac
===================================================================
--- trunk/OpenDNSSEC/configure.ac	2010-08-10 20:30:01 UTC (rev 3716)
+++ trunk/OpenDNSSEC/configure.ac	2010-08-10 21:10:25 UTC (rev 3717)
@@ -252,6 +252,8 @@
 	enforcer/utils/Makefile
 	enforcer/utils/ods-ksmutil.1
 	enforcer/test/Makefile
+	enforcer/test/database_setup_mysql.sh
+	enforcer/test/database_setup_sqlite3.sh
 	libhsm/Makefile
 	libhsm/src/Makefile
 	libhsm/src/ods-hsmspeed.1

Modified: trunk/OpenDNSSEC/enforcer/test/test_routines_database.c
===================================================================
--- trunk/OpenDNSSEC/enforcer/test/test_routines_database.c	2010-08-10 20:30:01 UTC (rev 3716)
+++ trunk/OpenDNSSEC/enforcer/test/test_routines_database.c	2010-08-10 21:10:25 UTC (rev 3717)
@@ -112,9 +112,9 @@
 	int			status;		/* Status return from connection */
 
 #ifdef USE_MYSQL
-	(void) system("sh ./database_setup.sh setup");
+	(void) system("sh ./database_setup_mysql.sh setup");
 #else
-	(void) system("sh ./database_setup_lite.sh setup");
+	(void) system("sh ./database_setup_sqlite3.sh setup");
 #endif
 
 	DbInit();
@@ -134,9 +134,9 @@
 	DbRundown();
 
 #ifdef USE_MYSQL
-	(void) system("sh ./database_setup.sh teardown");
+	(void) system("sh ./database_setup_mysql.sh teardown");
 #else
-	(void) system("sh ./database_setup_lite.sh teardown");
+	(void) system("sh ./database_setup_sqlite3.sh teardown");
 #endif
 
 	return 0;




More information about the Opendnssec-commits mailing list