diff options
Diffstat (limited to 'source4/selftest')
| -rw-r--r-- | source4/selftest/knownfail | 8 | ||||
| -rwxr-xr-x | source4/selftest/tests.py | 6 |
2 files changed, 8 insertions, 6 deletions
diff --git a/source4/selftest/knownfail b/source4/selftest/knownfail index 0152676b77..ab1f8170c7 100644 --- a/source4/selftest/knownfail +++ b/source4/selftest/knownfail @@ -5,9 +5,11 @@ # a successful run for any of these tests an error. ^samba4.local.resolve.*.async ^samba4.local.iconv.*.next_codepoint() -^samba4.local.iconv.5M random UTF-16LE sequences # Fails because our CP850 module returns the wrong error codes -^samba4.local.convert_string_handle.iconv.modules.plato_cp850_utf8 -^samba4.local.convert_string.iconv.modules.plato +# these show that we still have some differences between our system +# with our internal iconv because it passes except when we bypass our +# internal iconv modules +^samba4.local.convert_string_handle.system.iconv.gd_ascii +^samba4.local.convert_string_handle.system.iconv.gd_iso8859_cp850 ^samba4..*base.delete.*.deltest17 ^samba4..*base.delete.*.deltest20a ^samba4..*base.delete.*.deltest20b diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py index 60e16a5d16..5b008a0e9d 100755 --- a/source4/selftest/tests.py +++ b/source4/selftest/tests.py @@ -273,9 +273,9 @@ for t in smb4torture_testsuites("local."): # Confirm these tests with the system iconv too for t in ["local.convert_string_handle", "local.convert_string", "local.ndr"]: - modname = "samba4.%s.iconv.modules" % t - cmdline = "%s %s %s" % (valgrindify(smb4torture), "ncalrpc: --option='iconv:native=false'", t) - plantestsuite_loadlist(modname, env, cmdline) + modname = "samba4.%s.system.iconv" % t + cmdline = "%s %s %s" % (valgrindify(smb4torture), "ncalrpc: --option='iconv:use_builtin_handlers=false'", t) + plantestsuite_loadlist(modname, "none", cmdline) tdbtorture4 = binpath("tdbtorture") if os.path.exists(tdbtorture4): |