Timerix/utf8proc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

compile more tests on Windows (#183)

Browse Source 
* compile more tests on Windows

* still disable charwidth tests

* silence warnings on MSVC about sscanf

* whoops

* silence warning
This commit is contained in:
Steven G. Johnson 2020-03-28 10:00:18 -04:00 committed by GitHub
parent 5f15b515e1
commit 6fff5f32bb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -82,15 +82,15 @@ if(UTF8PROC_ENABLE_TESTING)
add_test(testprintproperty printproperty) add_test(testprintproperty printproperty)
add_test(testvalid valid) add_test(testvalid valid)
if (NOT WIN32) if (NOT WIN32)
# Some test disabled, because they don't compile on Windows, missing getline, ... # no wcwidth function on Windows
add_executable(charwidth test/tests.h test/tests.c utf8proc.h test/charwidth.c) add_executable(charwidth test/tests.h test/tests.c utf8proc.h test/charwidth.c)
target_link_libraries(charwidth utf8proc) target_link_libraries(charwidth utf8proc)
add_test(testcharwidth charwidth)
endif()
add_executable(graphemetest test/tests.h test/tests.c utf8proc.h test/graphemetest.c) add_executable(graphemetest test/tests.h test/tests.c utf8proc.h test/graphemetest.c)
target_link_libraries(graphemetest utf8proc) target_link_libraries(graphemetest utf8proc)
add_executable(normtest test/tests.h test/tests.c utf8proc.h test/normtest.c) add_executable(normtest test/tests.h test/tests.c utf8proc.h test/normtest.c)
target_link_libraries(normtest utf8proc) target_link_libraries(normtest utf8proc)
add_test(testcharwidth charwidth)
#add_test(testgraphemetest graphemetest data/GraphemeBreakTest.txt) #add_test(testgraphemetest graphemetest data/GraphemeBreakTest.txt)
#add_test(testnormtest normtest data/NormalizationTest.txt) #add_test(testnormtest normtest data/NormalizationTest.txt)
endif() endif()
endif()

8
test/graphemetest.c
View File

@ -42,7 +42,7 @@ int main(int argc, char **argv)
if (si) { if (si) {
utf8proc_uint8_t utf8[1024]; /* copy src without 0xff grapheme separators */ utf8proc_uint8_t utf8[1024]; /* copy src without 0xff grapheme separators */
size_t i = 0, j = 0; size_t i = 0, j = 0;
utf8proc_ssize_t glen; utf8proc_ssize_t glen, k;
utf8proc_uint8_t *g; /* utf8proc_map grapheme results */ utf8proc_uint8_t *g; /* utf8proc_map grapheme results */
while (i < si) { while (i < si) {
if (src[i] != '/') if (src[i] != '/')
@ -58,9 +58,9 @@ int main(int argc, char **argv)
else { else {
check(glen >= 0, "utf8proc_map error = %s", check(glen >= 0, "utf8proc_map error = %s",
utf8proc_errmsg(glen)); utf8proc_errmsg(glen));
for (i = 0; i <= glen; ++i) for (k = 0; k <= glen; ++k)
if (g[i] == 0xff) if (g[k] == 0xff)
g[i] = '/'; /* easier-to-read output (/ is not in test strings) */ g[k] = '/'; /* easier-to-read output (/ is not in test strings) */
check(!strcmp((char*)g, (char*)src), check(!strcmp((char*)g, (char*)src),
"grapheme mismatch: \"%s\" instead of \"%s\"", (char*)g, (char*)src); "grapheme mismatch: \"%s\" instead of \"%s\"", (char*)g, (char*)src);
} }

5
test/tests.h
View File

@ -1,13 +1,16 @@
/* Common functions and includes for our test programs. */ /* Common functions and includes for our test programs. */
/* /*
* Set feature macro to enable getline() and wcwidth(). * Set feature macro to enable wcwidth().
* *
* Please refer to section 2.2.1 of POSIX.1-2008: * Please refer to section 2.2.1 of POSIX.1-2008:
* http://pubs.opengroup.org/onlinepubs/9699919799/functions/V2_chap02.html#tag_15_02_01_02 * http://pubs.opengroup.org/onlinepubs/9699919799/functions/V2_chap02.html#tag_15_02_01_02
*/ */
#define _XOPEN_SOURCE 700 #define _XOPEN_SOURCE 700
/* silence warnings about sscanf on Windows */
#define _CRT_SECURE_NO_WARNINGS
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <ctype.h> #include <ctype.h>