diff options
| author | Aaron Haslett <aaronhaslett@catalyst.net.nz> | 2019-07-22 13:35:21 +1200 |
|---|---|---|
| committer | Garming Sam <garming@samba.org> | 2019-08-20 03:40:28 +0000 |
| commit | 6dcf00ba0a470ba25aabae06b409ec95404c246f (patch) | |
| tree | 26fbac74c691e559b477627f7a3907c6e38e05de | |
| parent | c89df3862b17fad9c4648b5d9c6805120d732df8 (diff) | |
| download | samba-6dcf00ba0a470ba25aabae06b409ec95404c246f.tar.gz | |
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>
| -rw-r--r-- | python/samba/tests/usage.py | 2 | ||||
| -rw-r--r-- | selftest/knownfail.d/usage | 1 | ||||
| -rw-r--r-- | source4/scripting/bin/wscript_build | 3 | ||||
| -rw-r--r-- | source4/scripting/wscript_build | 2 |
4 files changed, 5 insertions, 3 deletions
diff --git a/python/samba/tests/usage.py b/python/samba/tests/usage.py index ba18a3e0729..4b7bccde758 100644 --- 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 0a495858e8c..3e54f80a2de 100644 --- 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 42b37faa32a..87d23545487 100644 --- 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 df24e921cd9..31c395d3e4b 100644 --- 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' |