summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2011-04-11 21:37:01 +1000
committerAndrew Tridgell <tridge@samba.org>2011-04-13 14:47:08 +1000
commita2c691ab9a21946e0c6a86d11278a1a220615dc8 (patch)
tree6adf71c5dde4e8c4940a24d165084f28401fb442
parent7bbd701a1397924e946cd709306b96576a9f797d (diff)
downloadsamba-a2c691ab9a21946e0c6a86d11278a1a220615dc8.tar.gz
samba-a2c691ab9a21946e0c6a86d11278a1a220615dc8.tar.bz2
samba-a2c691ab9a21946e0c6a86d11278a1a220615dc8.zip
lib/util/charset Rename convert_string test to allow a 'non_handle' test
A future commit will test (with a subset of tests) the varient of this function without _handle. Andrew Bartlett Signed-off-by: Andrew Tridgell <tridge@samba.org>
-rw-r--r--lib/util/charset/tests/convert_string.c5
-rw-r--r--source4/torture/local/local.c2
2 files changed, 3 insertions, 4 deletions
diff --git a/lib/util/charset/tests/convert_string.c b/lib/util/charset/tests/convert_string.c
index 1da9f0a8dd..ac0985c5e8 100644
--- a/lib/util/charset/tests/convert_string.c
+++ b/lib/util/charset/tests/convert_string.c
@@ -834,15 +834,14 @@ static bool test_plato_case_utf8(struct torture_context *tctx)
return true;
}
-struct torture_suite *torture_local_convert_string(TALLOC_CTX *mem_ctx)
+struct torture_suite *torture_local_convert_string_handle(TALLOC_CTX *mem_ctx)
{
- struct torture_suite *suite = torture_suite_create(mem_ctx, "convert_string_talloc");
+ struct torture_suite *suite = torture_suite_create(mem_ctx, "convert_string_handle");
torture_suite_add_simple_test(suite, "gd_iso8859_cp850", test_gd_iso8859_cp850);
torture_suite_add_simple_test(suite, "plato_english_iso8859_cp850", test_plato_english_iso8859_cp850);
torture_suite_add_simple_test(suite, "plato_cp850_utf8", test_plato_cp850_utf8);
torture_suite_add_simple_test(suite, "plato_latin_cp850_utf8", test_plato_latin_cp850_utf8);
- torture_suite_add_simple_test(suite, "plato_ascii_cp850_utf8", test_plato_latin_cp850_utf8);
return suite;
}
diff --git a/source4/torture/local/local.c b/source4/torture/local/local.c
index 53fab6636c..e7014f477b 100644
--- a/source4/torture/local/local.c
+++ b/source4/torture/local/local.c
@@ -60,7 +60,7 @@
torture_local_share,
torture_local_loadparm,
torture_local_charset,
- torture_local_convert_string,
+ torture_local_convert_string_handle,
torture_local_string_case,
torture_local_compression,
torture_local_event,