From 7bea2a7a4fec3dda19d08474c73f56a0f7cf2741 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Sun, 20 Jun 2010 21:16:24 -0400
Subject: [PATCH] Move utf8 validation tests to the test framework

---
 glib/tests/Makefile.am                | 3 +++
 {tests => glib/tests}/utf8-validate.c | 0
 tests/Makefile.am                     | 3 ---
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename {tests => glib/tests}/utf8-validate.c (100%)

diff --git a/glib/tests/Makefile.am b/glib/tests/Makefile.am
index 0e72e70..8c5097e 100644
--- a/glib/tests/Makefile.am
+++ b/glib/tests/Makefile.am
@@ -74,6 +74,9 @@ collate_LDADD       = $(progs_ldadd)
 TEST_PROGS         += utf8-pointer
 utf8_pointer_LDADD       = $(progs_ldadd)
 
+TEST_PROGS         += utf8-validate
+utf8_validate_LDADD       = $(progs_ldadd)
+
 if OS_UNIX
 
 # some testing of gtester funcitonality
diff --git a/tests/utf8-validate.c b/glib/tests/utf8-validate.c
similarity index 100%
rename from tests/utf8-validate.c
rename to glib/tests/utf8-validate.c
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 44afe95..967a88c 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -125,7 +125,6 @@ test_programs =					\
 	type-test				\
 	unicode-caseconv			\
 	unicode-encoding			\
-	utf8-validate				\
 	uri-test
 
 test_scripts = run-markup-tests.sh run-collate-tests.sh run-bookmark-test.sh run-assert-msg-test.sh
@@ -189,8 +188,6 @@ type_test_LDADD = $(progs_ldadd)
 unicode_encoding_LDADD = $(progs_ldadd)
 unicode_caseconv_LDADD = $(progs_ldadd)
 unicode_collate_LDADD = $(progs_ldadd)
-utf8_validate_LDADD = $(progs_ldadd)
-utf8_pointer_LDADD = $(progs_ldadd)
 uri_test_LDADD = $(progs_ldadd)
 markup_collect_LDADD = $(progs_ldadd)
 
-- 
2.7.4