[gtk+] Use TAP output for installed tests

From: Matthias Clasen <matthiasc src gnome org>
To: commits-list gnome org
Cc:
Subject: [gtk+] Use TAP output for installed tests
Date: Sat, 30 Jan 2016 16:06:42 +0000 (UTC)

commit 586522d83cc9ff6003597dc94f403bac4e3787b9
Author: Matthias Clasen <mclasen redhat com>
Date:   Sat Jan 30 10:29:06 2016 -0500

    Use TAP output for installed tests

 testsuite/a11y/a11ychildren.test.in          |    4 ++--
 testsuite/a11y/a11ymisc.test.in              |    4 ++--
 testsuite/a11y/a11ytext.test.in              |    4 ++--
 testsuite/a11y/a11ytree.test.in              |    4 ++--
 testsuite/a11y/a11yutil.test.in              |    4 ++--
 testsuite/a11y/a11yvalue.test.in             |    4 ++--
 testsuite/a11y/state/Makefile.am             |    3 ++-
 testsuite/css/nodes/test-css-nodes.test.in   |    3 ++-
 testsuite/css/parser/test-css-parser.test.in |    3 ++-
 testsuite/css/style/test-css-style.test.in   |    3 ++-
 testsuite/gdk/Makefile.am                    |    3 ++-
 testsuite/gtk/Makefile.am                    |    3 ++-
 testsuite/reftests/reftests-dark.test.in     |    3 ++-
 testsuite/reftests/reftests-hc.test.in       |    3 ++-
 testsuite/reftests/reftests-hci.test.in      |    3 ++-
 testsuite/reftests/reftests.test.in          |    3 ++-
 testsuite/tools/Makefile.am                  |    1 +
 17 files changed, 33 insertions(+), 22 deletions(-)
---
diff --git a/testsuite/a11y/a11ychildren.test.in b/testsuite/a11y/a11ychildren.test.in
index 91ee1c2..0447592 100644
--- a/testsuite/a11y/a11ychildren.test.in
+++ b/testsuite/a11y/a11ychildren.test.in
@@ -1,4 +1,4 @@
 [Test]
-Exec=/bin/sh -c "env G_ENABLE_DIAGNOSTIC=0 @libexecdir@/installed-tests/gtk+/children"
+Exec=/bin/sh -c "env G_ENABLE_DIAGNOSTIC=0 @libexecdir@/installed-tests/gtk+/children --tap"
 Type=session
-
+Output=TAP
diff --git a/testsuite/a11y/a11ymisc.test.in b/testsuite/a11y/a11ymisc.test.in
index 9de0253..0cbe273 100644
--- a/testsuite/a11y/a11ymisc.test.in
+++ b/testsuite/a11y/a11ymisc.test.in
@@ -1,4 +1,4 @@
 [Test]
-Exec=/bin/sh -c "env G_ENABLE_DIAGNOSTIC=0 @libexecdir@/installed-tests/gtk+/misc"
+Exec=/bin/sh -c "env G_ENABLE_DIAGNOSTIC=0 @libexecdir@/installed-tests/gtk+/misc --tap"
 Type=session
-
+Output=TAP
diff --git a/testsuite/a11y/a11ytext.test.in b/testsuite/a11y/a11ytext.test.in
index fb2db7d..9a9c597 100644
--- a/testsuite/a11y/a11ytext.test.in
+++ b/testsuite/a11y/a11ytext.test.in
@@ -1,4 +1,4 @@
 [Test]
-Exec=/bin/sh -c "env G_ENABLE_DIAGNOSTIC=0 @libexecdir@/installed-tests/gtk+/text"
+Exec=/bin/sh -c "env G_ENABLE_DIAGNOSTIC=0 @libexecdir@/installed-tests/gtk+/text --tap"
 Type=session
-
+Output=TAP
diff --git a/testsuite/a11y/a11ytree.test.in b/testsuite/a11y/a11ytree.test.in
index a21b61a..081438d 100644
--- a/testsuite/a11y/a11ytree.test.in
+++ b/testsuite/a11y/a11ytree.test.in
@@ -1,4 +1,4 @@
 [Test]
-Exec=/bin/sh -c "env G_ENABLE_DIAGNOSTIC=0 @libexecdir@/installed-tests/gtk+/tree-relationships"
+Exec=/bin/sh -c "env G_ENABLE_DIAGNOSTIC=0 @libexecdir@/installed-tests/gtk+/tree-relationships --tap"
 Type=session
-
+Output=TAP
diff --git a/testsuite/a11y/a11yutil.test.in b/testsuite/a11y/a11yutil.test.in
index ee1f654..fa6cc0b 100644
--- a/testsuite/a11y/a11yutil.test.in
+++ b/testsuite/a11y/a11yutil.test.in
@@ -1,4 +1,4 @@
 [Test]
-Exec=/bin/sh -c "env G_ENABLE_DIAGNOSTIC=0 @libexecdir@/installed-tests/gtk+/util"
+Exec=/bin/sh -c "env G_ENABLE_DIAGNOSTIC=0 @libexecdir@/installed-tests/gtk+/util --tap"
 Type=session
-
+Output=TAP
diff --git a/testsuite/a11y/a11yvalue.test.in b/testsuite/a11y/a11yvalue.test.in
index deb7960..70334ac 100644
--- a/testsuite/a11y/a11yvalue.test.in
+++ b/testsuite/a11y/a11yvalue.test.in
@@ -1,4 +1,4 @@
 [Test]
-Exec=/bin/sh -c "env G_ENABLE_DIAGNOSTIC=0 @libexecdir@/installed-tests/gtk+/value"
+Exec=/bin/sh -c "env G_ENABLE_DIAGNOSTIC=0 @libexecdir@/installed-tests/gtk+/value --tap"
 Type=session
-
+Output=TAP
diff --git a/testsuite/a11y/state/Makefile.am b/testsuite/a11y/state/Makefile.am
index 9d43ce9..cb9546d 100644
--- a/testsuite/a11y/state/Makefile.am
+++ b/testsuite/a11y/state/Makefile.am
@@ -40,7 +40,8 @@ statetest_DATA = $(testdata)
 a11ystate.test: Makefile
        $(AM_V_GEN) (echo '[Test]' > $  tmp; \
        echo 'Type=session-exclusive' >> $  tmp; \
-       echo 'Exec=env G_ENABLE_DIAGNOSTIC=0 $(insttestdir)/state-record --directory $(statetestdir)' >> $  
tmp; \
+       echo 'Output=TAP' >> $  tmp; \
+       echo 'Exec=env G_ENABLE_DIAGNOSTIC=0 $(insttestdir)/state-record --tap --directory $(statetestdir)'

$  tmp; \

        mv $  tmp $@)
 
 testfiles = a11ystate.test
diff --git a/testsuite/css/nodes/test-css-nodes.test.in b/testsuite/css/nodes/test-css-nodes.test.in
index 611e201..98c1cc1 100644
--- a/testsuite/css/nodes/test-css-nodes.test.in
+++ b/testsuite/css/nodes/test-css-nodes.test.in
@@ -1,3 +1,4 @@
 [Test]
-Exec=/bin/sh -c "cd @libexecdir@/installed-tests/gtk+/css/nodes && 
@libexecdir@/installed-tests/gtk+/css/nodes/test-css-nodes"
+Exec=/bin/sh -c "cd @libexecdir@/installed-tests/gtk+/css/nodes && 
@libexecdir@/installed-tests/gtk+/css/nodes/test-css-nodes --tap"
 Type=session
+Output=TAP
diff --git a/testsuite/css/parser/test-css-parser.test.in b/testsuite/css/parser/test-css-parser.test.in
index 91fd581..132944d 100644
--- a/testsuite/css/parser/test-css-parser.test.in
+++ b/testsuite/css/parser/test-css-parser.test.in
@@ -1,3 +1,4 @@
 [Test]
-Exec=/bin/sh -c "cd @libexecdir@/installed-tests/gtk+/css/parser && 
@libexecdir@/installed-tests/gtk+/css/parser/test-css-parser"
+Exec=/bin/sh -c "cd @libexecdir@/installed-tests/gtk+/css/parser && 
@libexecdir@/installed-tests/gtk+/css/parser/test-css-parser --tap"
 Type=session
+Output=TAP
diff --git a/testsuite/css/style/test-css-style.test.in b/testsuite/css/style/test-css-style.test.in
index 6d00d8d..c36aa00 100644
--- a/testsuite/css/style/test-css-style.test.in
+++ b/testsuite/css/style/test-css-style.test.in
@@ -1,3 +1,4 @@
 [Test]
-Exec=/bin/sh -c "cd @libexecdir@/installed-tests/gtk+/css/style && 
@libexecdir@/installed-tests/gtk+/css/style/test-css-style"
+Exec=/bin/sh -c "cd @libexecdir@/installed-tests/gtk+/css/style && 
@libexecdir@/installed-tests/gtk+/css/style/test-css-style --tap"
 Type=session
+Output=TAP
diff --git a/testsuite/gdk/Makefile.am b/testsuite/gdk/Makefile.am
index 32b018a..599dbba 100644
--- a/testsuite/gdk/Makefile.am
+++ b/testsuite/gdk/Makefile.am
@@ -37,7 +37,8 @@ insttest_PROGRAMS = $(TEST_PROGS)
 %.test: %$(EXEEXT) Makefile
        $(AM_V_GEN) (echo '[Test]' > $  tmp; \
        echo 'Type=session' >> $  tmp; \
-       echo 'Exec=$(insttestdir)/$<' >> $  tmp; \
+       echo 'Output=TAP' >> $  tmp; \
+       echo 'Exec=$(insttestdir)/$< --tap' >> $  tmp; \
        mv $  tmp $@)
 
 test_files = $(TEST_PROGRS:=.test)
diff --git a/testsuite/gtk/Makefile.am b/testsuite/gtk/Makefile.am
index 7d1bda4..b6a7450 100644
--- a/testsuite/gtk/Makefile.am
+++ b/testsuite/gtk/Makefile.am
@@ -255,7 +255,8 @@ nobase_insttest_DATA = $(test_icontheme) $(test_ui)
 %.test: %$(EXEEXT) Makefile
        $(AM_V_GEN) (echo '[Test]' > $  tmp; \
        echo 'Type=session' >> $  tmp; \
-       echo 'Exec=env G_ENABLE_DIAGNOSTIC=0 $(insttestdir)/$<' >> $  tmp; \
+       echo 'Output=TAP' >> $  tmp; \
+       echo 'Exec=env G_ENABLE_DIAGNOSTIC=0 $(insttestdir)/$< --tap' >> $  tmp; \
        mv $  tmp $@)
 
 test_files = $(TEST_PROGS:=.test)
diff --git a/testsuite/reftests/reftests-dark.test.in b/testsuite/reftests/reftests-dark.test.in
index ea3b409..9ff9e21 100644
--- a/testsuite/reftests/reftests-dark.test.in
+++ b/testsuite/reftests/reftests-dark.test.in
@@ -1,3 +1,4 @@
 [Test]
-Exec=/bin/sh -c "env GTK_THEME=Adwaita:dark G_ENABLE_DIAGNOSTIC=0 
@libexecdir@/installed-tests/gtk+/gtk-reftest -k --verbose --output $(pwd) --directory 
@libexecdir@/installed-tests/gtk+/reftests"
+Exec=/bin/sh -c "env GTK_THEME=Adwaita:dark G_ENABLE_DIAGNOSTIC=0 
@libexecdir@/installed-tests/gtk+/gtk-reftest -k --verbose --tap --output $(pwd) --directory 
@libexecdir@/installed-tests/gtk+/reftests"
 Type=session-exclusive
+Output=TAP
diff --git a/testsuite/reftests/reftests-hc.test.in b/testsuite/reftests/reftests-hc.test.in
index 7475161..ea3ae9e 100644
--- a/testsuite/reftests/reftests-hc.test.in
+++ b/testsuite/reftests/reftests-hc.test.in
@@ -1,3 +1,4 @@
 [Test]
-Exec=/bin/sh -c "env GTK_THEME=HighContrast G_ENABLE_DIAGNOSTIC=0 
@libexecdir@/installed-tests/gtk+/gtk-reftest -k --verbose --output $(pwd) --directory 
@libexecdir@/installed-tests/gtk+/reftests"
+Exec=/bin/sh -c "env GTK_THEME=HighContrast G_ENABLE_DIAGNOSTIC=0 
@libexecdir@/installed-tests/gtk+/gtk-reftest -k --verbose --tap --output $(pwd) --directory 
@libexecdir@/installed-tests/gtk+/reftests"
 Type=session-exclusive
+Output=TAP
diff --git a/testsuite/reftests/reftests-hci.test.in b/testsuite/reftests/reftests-hci.test.in
index a6466c8..d08bb98 100644
--- a/testsuite/reftests/reftests-hci.test.in
+++ b/testsuite/reftests/reftests-hci.test.in
@@ -1,3 +1,4 @@
 [Test]
-Exec=/bin/sh -c "env GTK_THEME=HighContrastInverse G_ENABLE_DIAGNOSTIC=0 
@libexecdir@/installed-tests/gtk+/gtk-reftest -k --verbose --output $(pwd) --directory 
@libexecdir@/installed-tests/gtk+/reftests"
+Exec=/bin/sh -c "env GTK_THEME=HighContrastInverse G_ENABLE_DIAGNOSTIC=0 
@libexecdir@/installed-tests/gtk+/gtk-reftest -k --verbose --tap --output $(pwd) --directory 
@libexecdir@/installed-tests/gtk+/reftests"
 Type=session-exclusive
+Output=TAP
diff --git a/testsuite/reftests/reftests.test.in b/testsuite/reftests/reftests.test.in
index 0c4d596..6b8a42f 100644
--- a/testsuite/reftests/reftests.test.in
+++ b/testsuite/reftests/reftests.test.in
@@ -1,3 +1,4 @@
 [Test]
-Exec=/bin/sh -c "env G_ENABLE_DIAGNOSTIC=0 @libexecdir@/installed-tests/gtk+/gtk-reftest -k --verbose 
--output $(pwd) --directory @libexecdir@/installed-tests/gtk+/reftests"
+Exec=/bin/sh -c "env G_ENABLE_DIAGNOSTIC=0 @libexecdir@/installed-tests/gtk+/gtk-reftest -k --verbose --tap 
--output $(pwd) --directory @libexecdir@/installed-tests/gtk+/reftests"
 Type=session-exclusive
+Output=TAP
diff --git a/testsuite/tools/Makefile.am b/testsuite/tools/Makefile.am
index c0fc0c3..37f7a41 100644
--- a/testsuite/tools/Makefile.am
+++ b/testsuite/tools/Makefile.am
@@ -36,6 +36,7 @@ nobase_insttest_DATA = $(test_simplify)
 test-simplify.test: test-simplify Makefile
        $(AM_V_GEN) (echo '[Test]' > $  tmp; \
        echo 'Type=session' >> $  tmp; \
+       echo 'Output=TAP' >> $  tmp; \
        echo 'Exec env G_ENABLE_DIAGNOSTIC=0 TEST_DATA_DIR="$(insttestdir)/simplify" $(insttestdir)/$<' >> $  
tmp; \
        mv $  tmp $@)

[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]