downgradedatabase: installing script

Installing downgrade script so people don't need the source tree for it.

Exception added in usage test because running the script without arguments
is valid. (This avoids the need to knownfail it).

BUG: https://bugzilla.samba.org/show_bug.cgi?id=14059

Signed-off-by: Aaron Haslett <aaronhaslett@catalyst.net.nz>
Signed-off-by: Tim Beale <timbeale@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>

diff --git a/python/samba/tests/usage.py b/python/samba/tests/usage.py
index ba18a3e07290f187afd98bf2660cf1195664baea..4b7bccde75818f1dc460a25e83e82a21de927cf1 100644 (file)
--- a/python/samba/tests/usage.py
+++ b/python/samba/tests/usage.py
@@ -78,6 +78,8 @@ EXCLUDE_USAGE = {
     'selftest/tap2subunit',
     'script/show_test_time',
     'source4/scripting/bin/subunitrun',
+    'bin/samba_downgrade_db',
+    'source4/scripting/bin/samba_downgrade_db',
     'source3/selftest/tests.py',
     'selftest/tests.py',
     'python/samba/subunit/run.py',

diff --git a/selftest/knownfail.d/usage b/selftest/knownfail.d/usage
index 0a495858e8c7c639c4310f4ef3c90f9deb4112b7..3e54f80a2de35a9a57b541ead51715198aa64bc8 100644 (file)
--- a/selftest/knownfail.d/usage
+++ b/selftest/knownfail.d/usage
@@ -25,7 +25,6 @@ samba.tests.usage.samba.tests.usage.PythonScriptUsageTests.test_rebuildextendedd
 samba.tests.usage.samba.tests.usage.PythonScriptUsageTests.test_renamedc.none.
 samba.tests.usage.samba.tests.usage.PythonScriptUsageTests.test_repl_cleartext_pwd_py.none.
 samba.tests.usage.samba.tests.usage.PythonScriptUsageTests.test_rodcdns.none.
-samba.tests.usage.samba.tests.usage.PythonScriptUsageTests.test_samba_downgrade_db.none.
 samba.tests.usage.samba.tests.usage.PythonScriptUsageTests.test_samba_gpupdate.none.
 samba.tests.usage.samba.tests.usage.PythonScriptUsageTests.test_samba_gpupdate_.none.
 samba.tests.usage.samba.tests.usage.PythonScriptUsageTests.test_samba_kcc.none.

diff --git a/source4/scripting/bin/wscript_build b/source4/scripting/bin/wscript_build
index 42b37faa32a63c1f19fa0acab34573e6a6d75376..87d23545487a9e56caceca1cbed739097ad4d619 100644 (file)
--- a/source4/scripting/bin/wscript_build
+++ b/source4/scripting/bin/wscript_build
@@ -7,6 +7,7 @@ if bld.CONFIG_SET('AD_DC_BUILD_IS_ENABLED'):
                    'samba_kcc',
                    'samba_upgradeprovision',
                    'samba_upgradedns',
-                   'gen_output.py']:
+                   'gen_output.py',
+                   'samba_downgrade_db']:
         bld.SAMBA_SCRIPT(script, pattern=script, installdir='.')
 bld.SAMBA_SCRIPT('samba-gpupdate', pattern='samba-gpupdate', installdir='.')

diff --git a/source4/scripting/wscript_build b/source4/scripting/wscript_build
index df24e921cd99285b29ecfd00d127e4c44e35acdf..31c395d3e4b203606c1ab5c2809687483c9289c6 100644 (file)
--- a/source4/scripting/wscript_build
+++ b/source4/scripting/wscript_build
@@ -4,7 +4,7 @@ from samba_utils import MODE_755
 
 sbin_files = ''
 if bld.CONFIG_SET('AD_DC_BUILD_IS_ENABLED'):
-    sbin_files = 'bin/samba_dnsupdate bin/samba_spnupdate bin/samba_upgradedns bin/samba_kcc '
+    sbin_files = 'bin/samba_downgrade_db bin/samba_dnsupdate bin/samba_spnupdate bin/samba_upgradedns bin/samba_kcc '
 sbin_files += 'bin/samba-gpupdate'
 man_files = 'man/samba-gpupdate.8'