Change W32 console detection to look at the window, not stdout

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

diff --git a/glib/tests/Makefile.am b/glib/tests/Makefile.am
index eaa99ae..445040a 100644 (file)
--- a/glib/tests/Makefile.am
+++ b/glib/tests/Makefile.am
@@ -22,6 +22,7 @@ dist_test_data = \
 
 dist_test_extra_scripts = \
        echo-script                     \
+       echo-script.bat                 \
        $(NULL)
 
 test_extra_programs = \
@@ -56,7 +57,9 @@ test_programs = \
        list                            \
        logging                         \
        mainloop                        \
+       malloc                          \
        mappedfile                      \
+       markup                          \
        markup-parse                    \
        markup-collect                  \
        markup-escape                   \
@@ -90,6 +93,7 @@ test_programs = \
        test-printf                     \
        thread                          \
        timeout                         \
+       timer                           \
        tree                            \
        utf8-performance                \
        utf8-pointer                    \
@@ -142,10 +146,17 @@ markup_tests = \
        valid-1 valid-2 valid-3 valid-4 valid-5 \
        valid-6 valid-7 valid-8 valid-9 valid-10 \
        valid-11 valid-12 valid-13 valid-14 valid-15 \
+       valid-16 \
+       $(NULL)
+
+cdata_markup_tests = \
+       valid-8 valid-16 \
        $(NULL)
 
 dist_test_data += $(all_markup_data)
-all_markup_data = $(addprefix markups/,$(markup_tests:=.gmarkup) $(markup_tests:=.expected))
+all_markup_data = \
+       $(addprefix markups/,$(markup_tests:=.gmarkup) $(markup_tests:=.expected)) \
+       $(addprefix markups/,$(cdata_markup_tests.=.cdata-as-text))
 
 # -----------------------------------------------------------------------------
 
@@ -182,7 +193,7 @@ gtester-xmllint-check: # check testreport xml with xmllint if present
        ${GTESTER} -k --quiet -o tmpsample.xml --test-arg=--gtester-selftest ${GTESTER}
        ${XMLLINT} --version 2>/dev/null; test "$$?" != 0 || ${XMLLINT} --noout tmpsample.xml
 
-CLEANFILES += tmpsample.xml
+CLEANFILES += tmpsample.xml key_file_* out.xbel
 
 check-am: gtester-xmllint-check