diff options
| -rwxr-xr-x | buildtools/wafsamba/test_duplicate_symbol.sh | 12 | ||||
| -rw-r--r-- | selftest/tests.py | 1 | ||||
| -rw-r--r-- | selftest/wscript | 3 |
3 files changed, 13 insertions, 3 deletions
diff --git a/buildtools/wafsamba/test_duplicate_symbol.sh b/buildtools/wafsamba/test_duplicate_symbol.sh new file mode 100755 index 00000000000..712c7e63609 --- /dev/null +++ b/buildtools/wafsamba/test_duplicate_symbol.sh @@ -0,0 +1,12 @@ +#!/bin/sh +# Run the waf duplicate symbol check, wrapped in subunit. + +. lib/subunit/shell/share/subunit.sh + +subunit_start_test duplicate_symbols + +if ./buildtools/bin/waf build --dup-symbol-check; then + subunit_pass_test duplicate_symbols +else + echo | subunit_fail_test duplicate_symbols +fi diff --git a/selftest/tests.py b/selftest/tests.py index a6a5186e823..7191fabbab2 100644 --- a/selftest/tests.py +++ b/selftest/tests.py @@ -92,3 +92,4 @@ planpythontestsuite("none", "samba.tests.upgradeprovision") planpythontestsuite("none", "samba.tests.xattr") planpythontestsuite("none", "samba.tests.ntacls") planpythontestsuite("none", "samba.tests.policy") +plantestsuite("wafsamba.duplicate_symbols", "none", [os.path.join(srcdir(), "buildtools/wafsamba/test_duplicate_symbol.sh")]) diff --git a/selftest/wscript b/selftest/wscript index a57f7c17bcf..f2520c3293a 100644 --- a/selftest/wscript +++ b/selftest/wscript @@ -243,8 +243,5 @@ def cmd_test(opt): # if running all tests, then force a symbol check env = LOAD_ENVIRONMENT() CHECK_MAKEFLAGS(env) - if not Options.options.TESTS and not Options.options.TESTENV: - Options.options.DUP_SYMBOLCHECK = True - Scripting.commands.append('build') Scripting.commands.append('testonly') |