Changeset 745 for trunk/server/lib/util/charset/tests

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• lib/util/charset/tests/charset.c (modified) (1 diff)
• lib/util/charset/tests/iconv.c (modified) (10 diffs)

trunk/server/lib/util/charset/tests/charset.c

@@ -247 +247 @@
 struct torture_suite *torture_local_charset(TALLOC_CTX *mem_ctx)
 {
-        struct torture_suite *suite = torture_suite_create(mem_ctx, "CHARSET");
+        struct torture_suite *suite = torture_suite_create(mem_ctx, "charset");
 
         torture_suite_add_simple_test(suite, "toupper_m", test_toupper_m);

trunk/server/lib/util/charset/tests/iconv.c

@@ -36 +36 @@
         iconv_t cd;
 
-        if (!lp_parm_bool(tctx->lp_ctx, NULL, "iconv", "native", true))
+        if (!lpcfg_parm_bool(tctx->lp_ctx, NULL, "iconv", "native", true))
                 torture_skip(tctx, "system iconv disabled - skipping test");
 
@@ -135 +135 @@
         uint8_t buf1[1000], buf2[1000], buf3[1000];
         size_t outsize1, outsize2, outsize3;
-        const char *ptr_in;
+        char *ptr_in;
         char *ptr_out;
         size_t size_in1, size_in2, size_in3;
@@ -159 +159 @@
                                                      charset));
                 }
-                cd2 = smb_iconv_open_ex(test, charset, "UTF-16LE", lp_parm_bool(test->lp_ctx, NULL, "iconv", "native", true));
-                cd3 = smb_iconv_open_ex(test, "UTF-16LE", charset, lp_parm_bool(test->lp_ctx, NULL, "iconv", "native", true));
+                cd2 = smb_iconv_open_ex(test, charset, "UTF-16LE", lpcfg_parm_bool(test->lp_ctx, NULL, "iconv", "native", true));
+                cd3 = smb_iconv_open_ex(test, "UTF-16LE", charset, lpcfg_parm_bool(test->lp_ctx, NULL, "iconv", "native", true));
                 last_charset = charset;
         }
 
         /* internal convert to charset - placing result in buf1 */
-        ptr_in = (const char *)inbuf;
+        ptr_in = (char *)inbuf;
         ptr_out = (char *)buf1;
         size_in1 = size;
@@ -172 +172 @@
         memset(ptr_out, 0, outsize1);
         errno = 0;
-        ret1 = smb_iconv(cd2, &ptr_in, &size_in1, &ptr_out, &outsize1);
+        ret1 = smb_iconv(cd2, (const char **) &ptr_in, &size_in1, &ptr_out, &outsize1);
         errno1 = errno;
 
         /* system convert to charset - placing result in buf2 */
-        ptr_in = (const char *)inbuf;
+        ptr_in = (char *)inbuf;
         ptr_out = (char *)buf2;
         size_in2 = size;
@@ -183 +183 @@
         memset(ptr_out, 0, outsize2);
         errno = 0;
-        ret2 = iconv(cd, discard_const_p(char *, &ptr_in), &size_in2, &ptr_out, &outsize2);
+        ret2 = iconv(cd, &ptr_in, &size_in2, &ptr_out, &outsize2);
         errno2 = errno;
 
@@ -237 +237 @@
         /* convert back to UTF-16, putting result in buf3 */
         size = size - size_in1;
-        ptr_in = (const char *)buf1;
+        ptr_in = (char *)buf1;
         ptr_out = (char *)buf3;
         size_in3 = len1;
@@ -243 +243 @@
 
         memset(ptr_out, 0, outsize3);
-        ret3 = smb_iconv(cd3, &ptr_in, &size_in3, &ptr_out, &outsize3);
+        ret3 = smb_iconv(cd3, (const char **) &ptr_in, &size_in3, &ptr_out, &outsize3);
 
         /* we only internally support the first 1M codepoints */
@@ -290 +290 @@
         codepoint_t c;
 
-        size = push_codepoint_convenience(lp_iconv_convenience(tctx->lp_ctx), (char *)buf, codepoint);
+        size = push_codepoint_convenience(lpcfg_iconv_convenience(tctx->lp_ctx), (char *)buf, codepoint);
         torture_assert(tctx, size != -1 || (codepoint >= 0xd800 && codepoint <= 0x10000), 
                        "Invalid Codepoint range");
@@ -301 +301 @@
         buf[size+3] = random();
 
-        c = next_codepoint_convenience(lp_iconv_convenience(tctx->lp_ctx), (char *)buf, &size2);
+        c = next_codepoint_convenience(lpcfg_iconv_convenience(tctx->lp_ctx), (char *)buf, &size2);
 
         torture_assert(tctx, c == codepoint, 
@@ -452 +452 @@
 struct torture_suite *torture_local_iconv(TALLOC_CTX *mem_ctx)
 {
-        struct torture_suite *suite = torture_suite_create(mem_ctx, "ICONV");
+        struct torture_suite *suite = torture_suite_create(mem_ctx, "iconv");
 
         torture_suite_add_simple_test(suite, "string2key",