luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-24 22:46:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Move charset conversion tests to the test framework

Browse Source
This commit is contained in:
Matthias Clasen 2010-07-03 13:43:25 -04:00
parent 401fa10445
commit 26e29cb360
3 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
glib/tests/Makefile.am
View File

@ -64,37 +64,40 @@ TEST_PROGS += regex
regex_LDADD = $(progs_ldadd) regex_LDADD = $(progs_ldadd)
TEST_PROGS += base64 TEST_PROGS += base64
base64_LDADD = $(progs_ldadd) base64_LDADD = $(progs_ldadd)
TEST_PROGS += sequence TEST_PROGS += sequence
sequence_LDADD = $(progs_ldadd) sequence_LDADD = $(progs_ldadd)
TEST_PROGS += scannerapi TEST_PROGS += scannerapi
scannerapi_LDADD = $(progs_ldadd) scannerapi_LDADD = $(progs_ldadd)
TEST_PROGS += collate TEST_PROGS += collate
collate_LDADD = $(progs_ldadd) collate_LDADD = $(progs_ldadd)
TEST_PROGS += utf8-pointer TEST_PROGS += utf8-pointer
utf8_pointer_LDADD = $(progs_ldadd) utf8_pointer_LDADD = $(progs_ldadd)
TEST_PROGS += utf8-validate TEST_PROGS += utf8-validate
utf8_validate_LDADD = $(progs_ldadd) utf8_validate_LDADD = $(progs_ldadd)
TEST_PROGS += utf8-misc TEST_PROGS += utf8-misc
utf8_misc_LDADD = $(progs_ldadd) utf8_misc_LDADD = $(progs_ldadd)
TEST_PROGS += checksum TEST_PROGS += checksum
checksum_LDADD = $(progs_ldadd) checksum_LDADD = $(progs_ldadd)
TEST_PROGS += hash TEST_PROGS += hash
hash_LDADD = $(progs_ldadd) hash_LDADD = $(progs_ldadd)
TEST_PROGS += date TEST_PROGS += date
date_LDADD = $(progs_ldadd) date_LDADD = $(progs_ldadd)
TEST_PROGS += node TEST_PROGS += node
node_LDADD = $(progs_ldadd) node_LDADD = $(progs_ldadd)
TEST_PROGS += convert
convert_LDADD = $(progs_ldadd)
if OS_UNIX if OS_UNIX

12
tests/convert-test.c → glib/tests/convert.c
View File

@ -653,10 +653,12 @@ test_unicode_conversions (void)
int int
main (int argc, char *argv[]) main (int argc, char *argv[])
{ {
test_iconv_state (); g_test_init (&argc, &argv, NULL);
test_one_half ();
test_byte_order ();
test_unicode_conversions ();
return 0; g_test_add_func ("/conversion/iconv-state", test_iconv_state);
g_test_add_func ("/conversion/illegal-sequence", test_one_half);
g_test_add_func ("/conversion/byte-order", test_byte_order);
g_test_add_func ("/conversion/unicode", test_unicode_conversions);
return g_test_run ();
} }

2
tests/Makefile.am
View File

@ -89,7 +89,6 @@ test_programs = \
$(CXX_TEST) \ $(CXX_TEST) \
child-test \ child-test \
completion-test \ completion-test \
convert-test \
dirname-test \ dirname-test \
file-test \ file-test \
env-test \ env-test \
@ -144,7 +143,6 @@ bit_test_LDADD = $(progs_ldadd)
bookmarkfile_test_LDADD = $(progs_ldadd) bookmarkfile_test_LDADD = $(progs_ldadd)
child_test_LDADD = $(thread_ldadd) child_test_LDADD = $(thread_ldadd)
completion_test_LDADD = $(progs_ldadd) completion_test_LDADD = $(progs_ldadd)
convert_test_LDADD = $(progs_ldadd)
date_test_LDADD = $(progs_ldadd) date_test_LDADD = $(progs_ldadd)
dirname_test_LDADD = $(progs_ldadd) dirname_test_LDADD = $(progs_ldadd)
file_test_LDADD = $(progs_ldadd) file_test_LDADD = $(progs_ldadd)