Added method g_network_address_parse_uri()

[platform/upstream/glib.git] / tests / Makefile.am

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 0298f2a..f6f527f 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -3,9 +3,7 @@ include $(top_srcdir)/Makefile.decl
 SUBDIRS=gobject refcount
 
 AM_CPPFLAGS =                          \
-       -I$(top_srcdir)                 \
-       -I$(top_srcdir)/glib            \
-       -I$(top_srcdir)/gmodule         \
+       $(gmodule_INCLUDES)             \
        $(GLIB_DEBUG_FLAGS)
 
 AM_CFLAGS = -g
@@ -67,18 +65,11 @@ noinst_PROGRAMS = $(TEST_PROGS)     \
        errorcheck-mutex-test   \
        assert-msg-test
 
-TEST_PROGS              += scannerapi
-scannerapi_SOURCES       = scannerapi.c
-scannerapi_LDADD         = $(progs_ldadd)
 TEST_PROGS             += testglib
 testglib_SOURCES         = testglib.c
 testglib_LDADD          = $(libglib)
-TEST_PROGS              += testingbase64
-testingbase64_SOURCES    = testingbase64.c
-testingbase64_LDADD      = $(progs_ldadd)
 
 
-patterntest_LDADD = $(libglib)
 testgdate_LDADD = $(libglib)
 testgdateparser_LDADD = $(libglib)
 unicode_normalize_LDADD = $(libglib)
@@ -91,36 +82,22 @@ endif
 
 test_programs =                                        \
        atomic-test                             \
-       base64-test                             \
        bit-test                                \
        $(CXX_TEST)                             \
-       checksum-test                           \
        child-test                              \
        completion-test                         \
-       convert-test                            \
-       date-test                               \
        dirname-test                            \
        file-test                               \
        env-test                                \
        gio-test                                \
-       hash-test                               \
        iochannel-test                          \
-       list-test                               \
        mainloop-test                           \
        mapping-test                            \
-       markup-collect                          \
-       markup-escape-test                      \
        module-test                             \
-       node-test                               \
        onceinit                                \
-       patterntest                             \
-       queue-test                              \
        asyncqueue-test                         \
        qsort-test                              \
        relation-test                           \
-       sequence-test                           \
-       shell-test                              \
-       slist-test                              \
        slice-test                              \
        slice-color                             \
        slice-concurrent                        \
@@ -129,18 +106,13 @@ test_programs =                                   \
        $(spawn_test_win32_gui)                 \
        thread-test                             \
        threadpool-test                         \
-       tree-test                               \
        type-test                               \
        unicode-caseconv                        \
-       unicode-encoding                        \
-       utf8-validate                           \
-       utf8-pointer                            \
-       uri-test                                \
-       regex-test
+       unicode-encoding
 
-test_scripts = run-markup-tests.sh run-collate-tests.sh run-bookmark-test.sh run-assert-msg-test.sh
+test_scripts = run-collate-tests.sh run-assert-msg-test.sh
 
-test_script_support_programs = markup-test unicode-collate bookmarkfile-test
+test_script_support_programs = unicode-collate
 
 check_PROGRAMS = $(test_programs) $(test_script_support_programs)
 
@@ -155,36 +127,24 @@ thread_ldadd = $(libgthread) $(G_THREAD_LIBS) $(progs_ldadd)
 module_ldadd = $(libgmodule) $(G_MODULE_LIBS) $(progs_ldadd)
 
 atomic_test_LDADD = $(progs_ldadd)
-base64_test_LDADD = $(progs_ldadd)
 bit_test_LDADD = $(progs_ldadd)
-bookmarkfile_test_LDADD = $(progs_ldadd)
-checksum_test_LDADD = $(progs_ldadd)
 child_test_LDADD = $(thread_ldadd)
 completion_test_LDADD = $(progs_ldadd)
-convert_test_LDADD = $(progs_ldadd)
 date_test_LDADD = $(progs_ldadd)
 dirname_test_LDADD = $(progs_ldadd)
 file_test_LDADD = $(progs_ldadd)
 env_test_LDADD = $(progs_ldadd)
 gio_test_LDADD = $(progs_ldadd)
-hash_test_LDADD = $(progs_ldadd)
 iochannel_test_LDADD = $(progs_ldadd)
 list_test_LDADD = $(progs_ldadd)
 mainloop_test_LDADD = $(thread_ldadd)
-markup_test_LDADD = $(progs_ldadd)
 mapping_test_LDADD = $(progs_ldadd)
-markup_escape_test_LDADD = $(progs_ldadd)
 module_test_LDADD = $(module_ldadd) $(module_test_exp)
 module_test_LDFLAGS = $(G_MODULE_LDFLAGS)
-node_test_LDADD = $(progs_ldadd)
 onceinit_LDADD = $(thread_ldadd)
-queue_test_LDADD = $(progs_ldadd)
 asyncqueue_test_LDADD = $(thread_ldadd)
 qsort_test_LDADD = $(progs_ldadd)
 relation_test_LDADD = $(progs_ldadd)
-sequence_test_LDADD = $(progs_ldadd)
-shell_test_LDADD = $(progs_ldadd)
-slist_test_LDADD = $(progs_ldadd)
 slice_test_SOURCES = slice-test.c memchunks.c
 slice_test_LDADD = $(thread_ldadd)
 slice_color_SOURCES = slice-color.c memchunks.c
@@ -196,16 +156,10 @@ slice_threadinit_LDADD = $(thread_ldadd)
 spawn_test_LDADD = $(progs_ldadd)
 thread_test_LDADD = $(thread_ldadd)
 threadpool_test_LDADD = $(thread_ldadd)
-tree_test_LDADD = $(progs_ldadd)
 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)
-regex_test_LDADD = $(progs_ldadd)
-markup_collect_LDADD = $(progs_ldadd)
 
 noinst_LTLIBRARIES = libmoduletestplugin_a.la libmoduletestplugin_b.la
 
@@ -222,15 +176,9 @@ dist-hook: $(BUILT_EXTRA_DIST)
        for f in $$files; do                                    \
          if test -f $$f; then d=.; else d=$(srcdir); fi;       \
          cp $$d/$$f $(distdir) || exit 1; done
-       mkdir $(distdir)/markups;                               \
-       for f in $(srcdir)/markups/* ; do                       \
-         cp $$f $(distdir)/markups; done 
        mkdir $(distdir)/collate;                               \
        for f in $(srcdir)/collate/* ; do                       \
           if test -f $$f; then cp $$f $(distdir)/collate; fi; done
-       mkdir $(distdir)/bookmarks;                             \
-       for f in $(srcdir)/bookmarks/* ; do                     \
-         cp $$f $(distdir)/bookmarks; done 
 
 DISTCLEANFILES =               \
        iochannel-test-outfile  \