From 7bc566a88277ecbc0f712b7c54116163930f187d Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Wed, 12 Aug 2009 11:09:50 +1000 Subject: s4:provision Allow provision-backend to not run slapd for 'make test' As the version of OpenLDAP required for Samba4 is fairly new, we don't want to make it a requirement before this python code is run in 'make test'. As such, skip over the actual starting of slapd, but check the rest runs alright (which still validates syntax and other modules). Andrew Bartlett --- source4/setup/provision-backend | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'source4/setup/provision-backend') diff --git a/source4/setup/provision-backend b/source4/setup/provision-backend index fb7f56b881..3da360447f 100755 --- a/source4/setup/provision-backend +++ b/source4/setup/provision-backend @@ -73,6 +73,9 @@ parser.add_option("--ol-olc", type="choice", metavar="OPENLDAP-OLC", choices=["yes", "no"]) parser.add_option("--ol-slapd", type="string", metavar="SLAPD-PATH", help="Path to OpenLDAP-Daemon (slapd) [e.g.:'/usr/local/libexec/slapd']. Required for Setup with OpenLDAP-Backend. OpenLDAP Version >= 2.4.17 should be used.") +parser.add_option("--testing-mode", type="choice", metavar="TESTING-MODE", + help="Do not select this option, except as part of 'make test' to verify behaviour without a slapd on the system", + choices=["yes", "no"]) opts = parser.parse_args()[0] @@ -112,4 +115,5 @@ provision_backend(setup_dir=setup_dir, message=message, smbconf=smbconf, targetd ol_mmr_urls=opts.ol_mmr_urls, ol_olc=opts.ol_olc, ol_slapd=opts.ol_slapd, - nosync=opts.nosync) + nosync=opts.nosync, + testing_mode=opts.testing_mode) -- cgit