Move charset conversion tests to the test framework

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

View File

@ -96,6 +96,9 @@ 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
# some testing of gtester funcitonality # some testing of gtester funcitonality

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 ();
} }

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)