add test use of betxns

7 files changed, 40 insertions, 0 deletions

diff --git a/configure.ac b/configure.ac
index 90dba52..47181f5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -481,6 +481,7 @@ TESTS_USE_REFINT=true
 TESTS_USE_MEMBEROF=true
 TESTS_USE_MANAGED_ENTRIES=true
 TESTS_USE_USN=true
+TESTS_USE_BETXN=true
 AC_ARG_ENABLE(tests-with-refint,
 	      AS_HELP_STRING([--disable-tests-with-refint],
 			     [skip tests which use the the refint plugin]),
@@ -521,10 +522,27 @@ AC_ARG_ENABLE(tests-with-usn,
 		  TESTS_USE_USN=false
 	      fi,
 	      AC_MSG_RESULT([running tests with usn enabled]))
+AC_ARG_ENABLE(tests-with-betxn,
+	      AS_HELP_STRING([--disable-tests-with-betxn],
+			     [skip tests which are impacted by betxns]),
+	      if test x$enableval = xyes ; then
+		  AC_MSG_RESULT([running tests with betxn enabled])
+	      else
+	          AC_MSG_RESULT([running tests with betxn disabled])
+		  TESTS_USE_BETXN=false
+	      fi,
+	      AC_MSG_RESULT([running tests with betxn enabled]))
 AC_SUBST(TESTS_USE_REFINT)
 AC_SUBST(TESTS_USE_MEMBEROF)
 AC_SUBST(TESTS_USE_MANAGED_ENTRIES)
 AC_SUBST(TESTS_USE_USN)
+AC_SUBST(TESTS_USE_BETXN)
+if $TESTS_USE_BETXN ; then
+	TEST_PLUGIN_BETXN_ENABLE_OR_NOT="nsslapd-pluginbetxn: on"
+else
+	TEST_PLUGIN_BETXN_ENABLE_OR_NOT="nsslapd-pluginbetxn: off"
+fi
+AC_SUBST(TEST_PLUGIN_BETXN_ENABLE_OR_NOT)
 
 AC_CONFIG_HEADER(src/config.h)
 AC_OUTPUT(Makefile yp/Makefile src/Makefile
diff --git a/tests/config/dse.ldif.initial.in b/tests/config/dse.ldif.initial.in
index e022671..5db1a7f 100644
--- a/tests/config/dse.ldif.initial.in
+++ b/tests/config/dse.ldif.initial.in
@@ -173,6 +173,7 @@ nsslapd-pluginId: NS7bitAttr
 nsslapd-pluginVersion: 1.1.1
 nsslapd-pluginVendor: Fedora Project
 nsslapd-pluginDescription: Enforce  7-bit clean attribute values
+@TEST_PLUGIN_BETXN_ENABLE_OR_NOT@
 
 dn: cn=ACL Plugin,cn=plugins,cn=config
 objectClass: top
@@ -203,6 +204,7 @@ nsslapd-pluginId: acl
 nsslapd-pluginVersion: 1.1.1
 nsslapd-pluginVendor: Fedora Project
 nsslapd-pluginDescription: acl access check plugin
+@TEST_PLUGIN_BETXN_ENABLE_OR_NOT@
 
 dn: cn=attribute uniqueness,cn=plugins,cn=config
 objectClass: top
@@ -220,6 +222,7 @@ nsslapd-pluginId: NSUniqueAttr
 nsslapd-pluginVersion: 1.1.1
 nsslapd-pluginVendor: Fedora Project
 nsslapd-pluginDescription: Enforce unique attribute values
+@TEST_PLUGIN_BETXN_ENABLE_OR_NOT@
 
 dn: cn=Binary Syntax,cn=plugins,cn=config
 objectClass: top
@@ -318,6 +321,7 @@ nsslapd-pluginId: chaining database
 nsslapd-pluginVersion: 1.1.1
 nsslapd-pluginVendor: Fedora Project
 nsslapd-pluginDescription: LDAP chaining backend database plugin
+@TEST_PLUGIN_BETXN_ENABLE_OR_NOT@
 
 dn: cn=Class of Service,cn=plugins,cn=config
 objectClass: top
@@ -335,6 +339,7 @@ nsslapd-pluginId: cos
 nsslapd-pluginVersion: 1.1.1
 nsslapd-pluginVendor: Fedora Project
 nsslapd-pluginDescription: class of service plugin
+@TEST_PLUGIN_BETXN_ENABLE_OR_NOT@
 
 dn: cn=Country String Syntax,cn=plugins,cn=config
 objectClass: top
@@ -392,6 +397,7 @@ nsslapd-pluginId: Distributed Numeric Assignment
 nsslapd-pluginVersion: 1.1.1
 nsslapd-pluginVendor: Fedora Project
 nsslapd-pluginDescription: Distributed Numeric Assignment plugin
+@TEST_PLUGIN_BETXN_ENABLE_OR_NOT@
 
 dn: cn=Enhanced Guide Syntax,cn=plugins,cn=config
 objectClass: top
@@ -463,6 +469,7 @@ nsslapd-pluginId: http-client
 nsslapd-pluginVersion: 1.1.1
 nsslapd-pluginVendor: Fedora Project
 nsslapd-pluginDescription: HTTP Client plugin
+@TEST_PLUGIN_BETXN_ENABLE_OR_NOT@
 
 dn: cn=Integer Syntax,cn=plugins,cn=config
 objectClass: top
@@ -522,6 +529,7 @@ nsslapd-pluginId: ldbm-backend
 nsslapd-pluginVersion: 1.1.1
 nsslapd-pluginVendor: Fedora Project
 nsslapd-pluginDescription: high-performance LDAP backend database plugin
+@TEST_PLUGIN_BETXN_ENABLE_OR_NOT@
 
 dn: cn=NIS Server,cn=plugins,cn=config
 objectClass: top
@@ -647,6 +655,7 @@ nsslapd-pluginId: retrocl
 nsslapd-pluginVersion: 1.1.1
 nsslapd-pluginVendor: Fedora Project
 nsslapd-pluginDescription: Retrocl Plugin
+@TEST_PLUGIN_BETXN_ENABLE_OR_NOT@
 
 dn: cn=Roles Plugin,cn=plugins,cn=config
 objectClass: top
@@ -664,6 +673,7 @@ nsslapd-pluginId: roles
 nsslapd-pluginVersion: 1.1.1
 nsslapd-pluginVendor: Fedora Project
 nsslapd-pluginDescription: roles plugin
+@TEST_PLUGIN_BETXN_ENABLE_OR_NOT@
 
 dn: cn=Schema Compatibility, cn=plugins, cn=config
 objectClass: top
@@ -721,6 +731,7 @@ nsslapd-pluginId: statechange
 nsslapd-pluginVersion: 1.1.1
 nsslapd-pluginVendor: Fedora Project
 nsslapd-pluginDescription: state change notification service plugin
+@TEST_PLUGIN_BETXN_ENABLE_OR_NOT@
 
 dn: cn=Telex Syntax,cn=plugins,cn=config
 objectClass: top
@@ -793,6 +804,7 @@ nsslapd-pluginId: views
 nsslapd-pluginVersion: 1.1.1
 nsslapd-pluginVendor: Fedora Project
 nsslapd-pluginDescription: virtual directory information tree views plugin
+@TEST_PLUGIN_BETXN_ENABLE_OR_NOT@
 
 dn: cn=mapping,cn=sasl,cn=config
 objectClass: top
diff --git a/tests/config/dse.ldif.memberof.in b/tests/config/dse.ldif.memberof.in
index 4d731b2..1d867c8 100644
--- a/tests/config/dse.ldif.memberof.in
+++ b/tests/config/dse.ldif.memberof.in
@@ -10,4 +10,5 @@ nsslapd-pluginenabled: on
 nsslapd-plugin-depends-on-type: database
 memberOfGroupAttr: member
 memberOfAttr: memberOf
+@TEST_PLUGIN_BETXN_ENABLE_OR_NOT@
 
diff --git a/tests/config/dse.ldif.mep.in b/tests/config/dse.ldif.mep.in
index e9d6ff3..513f284 100644
--- a/tests/config/dse.ldif.mep.in
+++ b/tests/config/dse.ldif.mep.in
@@ -9,6 +9,7 @@ nsslapd-plugininitfunc: mep_init
 nsslapd-plugintype: preoperation
 nsslapd-pluginenabled: on
 nsslapd-plugin-depends-on-type: database
+@TEST_PLUGIN_BETXN_ENABLE_OR_NOT@
 
 dn: cn=UPG Definition,cn=Managed Entries,cn=plugins,cn=config
 objectclass: extensibleObject
diff --git a/tests/config/dse.ldif.refint.in b/tests/config/dse.ldif.refint.in
index 8b217d3..8700d54 100644
--- a/tests/config/dse.ldif.refint.in
+++ b/tests/config/dse.ldif.refint.in
@@ -16,4 +16,5 @@ nsslapd-pluginArg4: uniquemember
 nsslapd-pluginArg5: owner
 nsslapd-pluginArg6: seeAlso
 nsslapd-plugin-depends-on-type: database
+@TEST_PLUGIN_BETXN_ENABLE_OR_NOT@
 
diff --git a/tests/config/dse.ldif.usn.in b/tests/config/dse.ldif.usn.in
index 1173eda..339ba49 100644
--- a/tests/config/dse.ldif.usn.in
+++ b/tests/config/dse.ldif.usn.in
@@ -8,4 +8,5 @@ nsslapd-plugininitfunc: usn_init
 nsslapd-plugintype: object
 nsslapd-pluginenabled: on
 nsslapd-plugin-depends-on-type: database
+@TEST_PLUGIN_BETXN_ENABLE_OR_NOT@
 
diff --git a/tests/run-tests.sh b/tests/run-tests.sh
index 3ab4fe1..91afdc9 100755
--- a/tests/run-tests.sh
+++ b/tests/run-tests.sh
@@ -40,6 +40,12 @@ for subdir in "$@" ; do
 			continue
 		fi
 	fi
+	if ! $TESTS_USE_BETXN ; then
+		if test -s $TESTDIR/$TEST/plugin-need-betxn.txt ; then
+			echo Skipping "$TEST", needs backend transaction support.
+			continue
+		fi
+	fi
 	if test -x edit-dse-config.sh ; then
 		precmd="$TESTDIR/$subdir/edit-dse-config.sh $BTESTDIR/config/dse.ldif"
 	fi