From: Brian Aker <brian@tangent.org>
Date: Tue, 6 Jan 2009 22:08:49 +0000 (-0800)
Subject: Merge
X-Git-Tag: 0.26~26
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=d7de77de3f79dd9a478ee40dd034af45b6a3f8ef;p=m6w6%2Flibmemcached

Merge
---

d7de77de3f79dd9a478ee40dd034af45b6a3f8ef
diff --cc tests/function.c
index 7ec22d4c,deccab14..411c12b6
--- a/tests/function.c
+++ b/tests/function.c
@@@ -3063,10 -3051,18 +3086,19 @@@ test_st user_tests[] =
    {"user_supplied_bug14", 1, user_supplied_bug14 },
    {"user_supplied_bug15", 1, user_supplied_bug15 },
    {"user_supplied_bug16", 1, user_supplied_bug16 },
+ #ifndef __sun
+   /* 
+   ** It seems to be something weird with the character sets.. 
+   ** value_fetch is unable to parse the value line (iscntrl "fails"), so I
+   ** guess I need to find out how this is supposed to work.. Perhaps I need
+   ** to run the test in a specific locale (I tried zh_CN.UTF-8 without success,
+   ** so just disable the code for now...).
+   */
    {"user_supplied_bug17", 1, user_supplied_bug17 },
+ #endif
    {"user_supplied_bug18", 1, user_supplied_bug18 },
    {"user_supplied_bug19", 1, user_supplied_bug19 },
 +  {"user_supplied_bug20", 1, user_supplied_bug20 },
    {0, 0, 0}
  };