Upgrade our <ctype.h> implementation to OpenBSD head.
Adding the perfunctory <ctype.h> tests showed that we'd accidentally
dropped several symbols. This puts everything back in its proper place
and switches us to upstream head at the same time.
Change-Id: Ib527ad280c9baded81e667fa598698526d93e66f
diff --git a/tests/Android.mk b/tests/Android.mk
index b32d8d4..723d7cf 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -40,6 +40,7 @@
libBionicStandardTests_src_files := \
buffer_tests.cpp \
+ ctype_test.cpp \
dirent_test.cpp \
eventfd_test.cpp \
fcntl_test.cpp \
diff --git a/tests/ctype_test.cpp b/tests/ctype_test.cpp
new file mode 100644
index 0000000..7b27d64
--- /dev/null
+++ b/tests/ctype_test.cpp
@@ -0,0 +1,138 @@
+/*
+ * Copyright (C) 2014 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <gtest/gtest.h>
+
+#include <ctype.h>
+
+TEST(ctype, isalnum) {
+ EXPECT_TRUE(isalnum('1'));
+ EXPECT_TRUE(isalnum('a'));
+ EXPECT_TRUE(isalnum('A'));
+ EXPECT_FALSE(isalnum('!'));
+ EXPECT_FALSE(isalnum(' '));
+}
+
+TEST(ctype, isalpha) {
+ EXPECT_FALSE(isalpha('1'));
+ EXPECT_TRUE(isalpha('a'));
+ EXPECT_TRUE(isalpha('A'));
+ EXPECT_FALSE(isalpha('!'));
+ EXPECT_FALSE(isalpha(' '));
+}
+
+TEST(ctype, isascii) {
+ EXPECT_TRUE(isascii('\x7f'));
+ EXPECT_FALSE(isascii('\x80'));
+}
+
+TEST(ctype, isblank) {
+ EXPECT_FALSE(isblank('1'));
+ EXPECT_TRUE(isblank(' '));
+ EXPECT_TRUE(isblank('\t'));
+}
+
+TEST(ctype, iscntrl) {
+ EXPECT_FALSE(iscntrl('1'));
+ EXPECT_TRUE(iscntrl('\b'));
+}
+
+TEST(ctype, isdigit) {
+ EXPECT_TRUE(isdigit('1'));
+ EXPECT_FALSE(isdigit('a'));
+ EXPECT_FALSE(isdigit('x'));
+}
+
+TEST(ctype, isgraph) {
+ EXPECT_TRUE(isgraph('a'));
+ EXPECT_TRUE(isgraph('A'));
+ EXPECT_TRUE(isgraph('1'));
+ EXPECT_TRUE(isgraph('!'));
+ EXPECT_FALSE(isgraph(' '));
+}
+
+TEST(ctype, islower) {
+ EXPECT_TRUE(islower('a'));
+ EXPECT_FALSE(islower('A'));
+ EXPECT_FALSE(islower('!'));
+}
+
+TEST(ctype, isprint) {
+ EXPECT_TRUE(isprint('a'));
+ EXPECT_TRUE(isprint(' '));
+ EXPECT_FALSE(isprint('\b'));
+}
+
+TEST(ctype, ispunct) {
+ EXPECT_TRUE(ispunct('!'));
+ EXPECT_FALSE(ispunct('a'));
+ EXPECT_FALSE(ispunct(' '));
+ EXPECT_FALSE(ispunct('\b'));
+}
+
+TEST(ctype, isspace) {
+ EXPECT_TRUE(isspace(' '));
+ EXPECT_TRUE(isspace('\f'));
+ EXPECT_TRUE(isspace('\n'));
+ EXPECT_TRUE(isspace('\r'));
+ EXPECT_TRUE(isspace('\t'));
+ EXPECT_TRUE(isspace('\v'));
+ EXPECT_FALSE(isspace('a'));
+ EXPECT_FALSE(isspace('!'));
+}
+
+TEST(ctype, isupper) {
+ EXPECT_TRUE(isupper('A'));
+ EXPECT_FALSE(isupper('a'));
+ EXPECT_FALSE(isupper('!'));
+}
+
+TEST(ctype, isxdigit) {
+ EXPECT_TRUE(isxdigit('0'));
+ EXPECT_FALSE(isxdigit('x'));
+ EXPECT_TRUE(isxdigit('1'));
+ EXPECT_TRUE(isxdigit('a'));
+ EXPECT_TRUE(isxdigit('A'));
+ EXPECT_FALSE(isxdigit('g'));
+ EXPECT_FALSE(isxdigit(' '));
+}
+
+TEST(ctype, toascii) {
+ EXPECT_EQ('a', toascii('a'));
+ EXPECT_EQ('a', toascii(0x80 | 'a'));
+}
+
+TEST(ctype, tolower) {
+ EXPECT_EQ('!', tolower('!'));
+ EXPECT_EQ('a', tolower('a'));
+ EXPECT_EQ('a', tolower('A'));
+}
+
+TEST(ctype, _tolower) {
+ // _tolower may mangle characters for which isupper is false.
+ EXPECT_EQ('a', _tolower('A'));
+}
+
+TEST(ctype, toupper) {
+ EXPECT_EQ('!', toupper('!'));
+ EXPECT_EQ('A', toupper('a'));
+ EXPECT_EQ('A', toupper('A'));
+}
+
+TEST(ctype, _toupper) {
+ // _toupper may mangle characters for which islower is false.
+ EXPECT_EQ('A', _toupper('a'));
+}