summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2011-09-10 09:53:29 +1000
committerAndrew Bartlett <abartlet@samba.org>2011-09-10 14:18:06 +0200
commit2085dffddb36e8ac3cfe83c3f318d49c96408274 (patch)
treeb8d4af8d35a3cea3b0fa41eebc406e8b7f2103fe /source4
parentfc6bb5d47a985d0215c2a8ea9a00c21abf131ad9 (diff)
downloadsamba-2085dffddb36e8ac3cfe83c3f318d49c96408274.tar.gz
samba-2085dffddb36e8ac3cfe83c3f318d49c96408274.tar.bz2
samba-2085dffddb36e8ac3cfe83c3f318d49c96408274.zip
lib/util/charset Run charset sets with and without the system iconv
We need to know that we can load the samba-provided modules, and that they are correct. However, we must mark a number of tests as knownfail due to errors in our internal iconv modules. Andrew Bartlett
Diffstat (limited to 'source4')
-rw-r--r--source4/selftest/knownfail3
-rwxr-xr-xsource4/selftest/tests.py6
2 files changed, 9 insertions, 0 deletions
diff --git a/source4/selftest/knownfail b/source4/selftest/knownfail
index 915591b9e3..0152676b77 100644
--- a/source4/selftest/knownfail
+++ b/source4/selftest/knownfail
@@ -5,6 +5,9 @@
# 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
^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 21e19554ba..f64a803a78 100755
--- a/source4/selftest/tests.py
+++ b/source4/selftest/tests.py
@@ -267,6 +267,12 @@ plansmbtorturetestsuite('echo.udp', 'dc:local', '//$SERVER/whatever')
for t in smb4torture_testsuites("local."):
plansmbtorturetestsuite(t, "none", "ncalrpc:")
+# 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)
+
tdbtorture4 = binpath("tdbtorture")
if os.path.exists(tdbtorture4):
plantestsuite("tdb.stress", "none", valgrindify(tdbtorture4))