[gtk+] testsuite: put installed tests in the right place

[Matthias Clasen <matthiasc src gnome org>]

commit 98cf67ddba167039b3bd2fe9d3c47e4a6e0f3982
Author: Matthias Clasen <mclasen redhat com>
Date:   Sat May 31 00:16:07 2014 -0400

    testsuite: put installed tests in the right place
    
    Follow the prevailing practice and put the installed tests
    into $libdir/installed-tests/$PACKAGE instead of
    $pkglibdir/installed-tests.

 testsuite/a11y/Makefile.am                   |    4 ++--
 testsuite/a11y/a11ychildren.test.in          |    2 +-
 testsuite/a11y/a11yderive.test.in            |    2 +-
 testsuite/a11y/a11ytests.test.in             |    2 +-
 testsuite/a11y/a11ytext.test.in              |    2 +-
 testsuite/a11y/a11ytree.test.in              |    2 +-
 testsuite/a11y/a11yutil.test.in              |    2 +-
 testsuite/a11y/a11yvalue.test.in             |    2 +-
 testsuite/css/Makefile.am                    |    4 ++--
 testsuite/css/api.test.in                    |    2 +-
 testsuite/css/parser/Makefile.am             |    4 ++--
 testsuite/css/parser/test-css-parser.test.in |    2 +-
 testsuite/gdk/Makefile.am                    |    2 +-
 testsuite/gtk/Makefile.am                    |    2 +-
 testsuite/reftests/Makefile.am               |    4 ++--
 testsuite/reftests/reftests.test.in          |    2 +-
 16 files changed, 20 insertions(+), 20 deletions(-)
---
diff --git a/testsuite/a11y/Makefile.am b/testsuite/a11y/Makefile.am
index 1176e71..96e3e8b 100644
--- a/testsuite/a11y/Makefile.am
+++ b/testsuite/a11y/Makefile.am
@@ -97,14 +97,14 @@ test_in_files = \
 EXTRA_DIST += $(test_in_files) $(testdata)
 
 if BUILDOPT_INSTALL_TESTS
-insttestdir=$(pkglibexecdir)/installed-tests
+insttestdir=$(libexecdir)/installed-tests/$(PACKAGE)
 insttest_PROGRAMS = $(TEST_PROGS)
 
 a11ytestdir = $(insttestdir)/a11ytests
 a11ytest_DATA = $(testdata)
 
 substitutions = \
-       -e s,@pkglibexecdir\@,$(pkglibexecdir),g \
+       -e s,@libexecdir\@,$(libexecdir),g \
        $(NULL)
 
 test_files = $(test_in_files:.test.in=.test)
diff --git a/testsuite/a11y/a11ychildren.test.in b/testsuite/a11y/a11ychildren.test.in
index 927cfe3..3424d6f 100644
--- a/testsuite/a11y/a11ychildren.test.in
+++ b/testsuite/a11y/a11ychildren.test.in
@@ -1,4 +1,4 @@
 [Test]
-Exec=/bin/sh -c "@pkglibexecdir@/installed-tests/children"
+Exec=/bin/sh -c "@libexecdir@/installed-tests/gtk+/children"
 Type=session
 
diff --git a/testsuite/a11y/a11yderive.test.in b/testsuite/a11y/a11yderive.test.in
index 665b2e9..12de661 100644
--- a/testsuite/a11y/a11yderive.test.in
+++ b/testsuite/a11y/a11yderive.test.in
@@ -1,4 +1,4 @@
 [Test]
-Exec=/bin/sh -c "@pkglibexecdir@/installed-tests/derive"
+Exec=/bin/sh -c "@libexecdir@/installed-tests/gtk+/derive"
 Type=session
 
diff --git a/testsuite/a11y/a11ytests.test.in b/testsuite/a11y/a11ytests.test.in
index b78b55f..acf2acd 100644
--- a/testsuite/a11y/a11ytests.test.in
+++ b/testsuite/a11y/a11ytests.test.in
@@ -1,4 +1,4 @@
 [Test]
-Exec=/bin/sh -c "@pkglibexecdir@/installed-tests/accessibility-dump -k --verbose --directory 
@pkglibexecdir@/installed-tests/a11ytests"
+Exec=/bin/sh -c "@libexecdir@/installed-tests/gtk+/accessibility-dump -k --verbose --directory 
@libexecdir@/installed-tests/gtk+/a11ytests"
 Type=session
 
diff --git a/testsuite/a11y/a11ytext.test.in b/testsuite/a11y/a11ytext.test.in
index c3435ed..3bac807 100644
--- a/testsuite/a11y/a11ytext.test.in
+++ b/testsuite/a11y/a11ytext.test.in
@@ -1,4 +1,4 @@
 [Test]
-Exec=/bin/sh -c "@pkglibexecdir@/installed-tests/text"
+Exec=/bin/sh -c "@libexecdir@/installed-tests/gtk+/text"
 Type=session
 
diff --git a/testsuite/a11y/a11ytree.test.in b/testsuite/a11y/a11ytree.test.in
index 390d1a5..4a9771e 100644
--- a/testsuite/a11y/a11ytree.test.in
+++ b/testsuite/a11y/a11ytree.test.in
@@ -1,4 +1,4 @@
 [Test]
-Exec=/bin/sh -c "@pkglibexecdir@/installed-tests/tree-relationships"
+Exec=/bin/sh -c "@libexecdir@/installed-tests/gtk+/tree-relationships"
 Type=session
 
diff --git a/testsuite/a11y/a11yutil.test.in b/testsuite/a11y/a11yutil.test.in
index 9140b9f..311c8f3 100644
--- a/testsuite/a11y/a11yutil.test.in
+++ b/testsuite/a11y/a11yutil.test.in
@@ -1,4 +1,4 @@
 [Test]
-Exec=/bin/sh -c "@pkglibexecdir@/installed-tests/util"
+Exec=/bin/sh -c "@libexecdir@/installed-tests/gtk+/util"
 Type=session
 
diff --git a/testsuite/a11y/a11yvalue.test.in b/testsuite/a11y/a11yvalue.test.in
index ddc16e2..5df76fd 100644
--- a/testsuite/a11y/a11yvalue.test.in
+++ b/testsuite/a11y/a11yvalue.test.in
@@ -1,4 +1,4 @@
 [Test]
-Exec=/bin/sh -c "@pkglibexecdir@/installed-tests/value"
+Exec=/bin/sh -c "@libexecdir@/installed-tests/gtk+/value"
 Type=session
 
diff --git a/testsuite/css/Makefile.am b/testsuite/css/Makefile.am
index e88e12d..d38fa8e 100644
--- a/testsuite/css/Makefile.am
+++ b/testsuite/css/Makefile.am
@@ -28,11 +28,11 @@ test_in_files += api.test.in
 EXTRA_DIST += $(test_in_files)
 
 if BUILDOPT_INSTALL_TESTS
-insttestdir=$(pkglibexecdir)/installed-tests/css
+insttestdir=$(libexecdir)/installed-tests/$(PACKAGE)/css
 insttest_PROGRAMS = $(TEST_PROGS)
 
 substitutions = \
-       -e s,@pkglibexecdir\@,$(pkglibexecdir),g \
+       -e s,@libexecdir\@,$(libexecdir),g \
        $(NULL)
 
 test_files = $(test_in_files:.test.in=.test)
diff --git a/testsuite/css/api.test.in b/testsuite/css/api.test.in
index 7966f5a..13bba4d 100644
--- a/testsuite/css/api.test.in
+++ b/testsuite/css/api.test.in
@@ -1,3 +1,3 @@
 [Test]
-Exec= pkglibexecdir@/installed-tests/css/api
+Exec= libexecdir@/installed-tests/gtk+/css/api
 Type=session
diff --git a/testsuite/css/parser/Makefile.am b/testsuite/css/parser/Makefile.am
index 084a340..e9ab80f 100644
--- a/testsuite/css/parser/Makefile.am
+++ b/testsuite/css/parser/Makefile.am
@@ -353,12 +353,12 @@ test_data = \
 EXTRA_DIST += $(test_in_files) $(test_data)
 
 if BUILDOPT_INSTALL_TESTS
-insttestdir=$(pkglibexecdir)/installed-tests/css/parser
+insttestdir=$(libexecdir)/installed-tests/$(PACKAGE)/css/parser
 insttest_PROGRAMS = $(TEST_PROGS)
 insttest_DATA = $(test_data)
 
 substitutions = \
-       -e s,@pkglibexecdir\@,$(pkglibexecdir),g \
+       -e s,@libexecdir\@,$(libexecdir),g \
        $(NULL)
 
 test_files = $(test_in_files:.test.in=.test)
diff --git a/testsuite/css/parser/test-css-parser.test.in b/testsuite/css/parser/test-css-parser.test.in
index 0b3c0ed..91fd581 100644
--- a/testsuite/css/parser/test-css-parser.test.in
+++ b/testsuite/css/parser/test-css-parser.test.in
@@ -1,3 +1,3 @@
 [Test]
-Exec=/bin/sh -c "cd @pkglibexecdir@/installed-tests/css/parser && 
@pkglibexecdir@/installed-tests/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"
 Type=session
diff --git a/testsuite/gdk/Makefile.am b/testsuite/gdk/Makefile.am
index 0f5f960..5b0d30f 100644
--- a/testsuite/gdk/Makefile.am
+++ b/testsuite/gdk/Makefile.am
@@ -30,7 +30,7 @@ CLEANFILES =                  \
        $(NULL)
 
 if BUILDOPT_INSTALL_TESTS
-insttestdir=$(pkglibexecdir)/installed-tests
+insttestdir=$(libexecdir)/installed-tests/$(PACKAGE)
 insttest_PROGRAMS = $(TEST_PROGS)
 
 %.test: %$(EXEEXT) Makefile
diff --git a/testsuite/gtk/Makefile.am b/testsuite/gtk/Makefile.am
index 629402d..a2f6fc6 100644
--- a/testsuite/gtk/Makefile.am
+++ b/testsuite/gtk/Makefile.am
@@ -162,7 +162,7 @@ gschemas.compiled: $(GTK_GSETTINGS_SCHEMAS)
 all-am: gschemas.compiled
 
 if BUILDOPT_INSTALL_TESTS
-insttestdir = $(pkglibexecdir)/installed-tests
+insttestdir = $(libexecdir)/installed-tests/$(PACKAGE)
 insttest_PROGRAMS = $(TEST_PROGS)
 nobase_insttest_DATA = $(test_icontheme)
 
diff --git a/testsuite/reftests/Makefile.am b/testsuite/reftests/Makefile.am
index 50fb091..7c63241 100644
--- a/testsuite/reftests/Makefile.am
+++ b/testsuite/reftests/Makefile.am
@@ -344,7 +344,7 @@ EXTRA_DIST +=                       \
        $(NULL)
 
 if BUILDOPT_INSTALL_TESTS
-insttestdir=$(pkglibexecdir)/installed-tests
+insttestdir=$(libexecdir)/installed-tests/$(PACKAGE)
 insttest_PROGRAMS = gtk-reftest
 
 reftestdir = $(insttestdir)/reftests
@@ -361,7 +361,7 @@ libreftest_la_SOURCES =                     \
        $(NULL)
 
 substitutions = \
-       -e s,@pkglibexecdir\@,$(pkglibexecdir),g \
+       -e s,@libexecdir\@,$(libexecdir),g \
        $(NULL)
 
 reftests.test: reftests.test.in Makefile
diff --git a/testsuite/reftests/reftests.test.in b/testsuite/reftests/reftests.test.in
index 93632e1..0dbf25f 100644
--- a/testsuite/reftests/reftests.test.in
+++ b/testsuite/reftests/reftests.test.in
@@ -1,3 +1,3 @@
 [Test]
-Exec=/bin/sh -c "GTK_DEBUG=icontheme @pkglibexecdir@/installed-tests/gtk-reftest -k --verbose --output 
$(pwd) --directory @pkglibexecdir@/installed-tests/reftests"
+Exec=/bin/sh -c "GTK_DEBUG=icontheme @libexecdir@/installed-tests/gtk+/gtk-reftest -k --verbose --output 
$(pwd) --directory @libexecdir@/installed-tests/gtk+/reftests"
 Type=session-exclusive