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.
This commit is contained in:
Matthias Clasen 2014-05-31 00:16:07 -04:00
parent 921b6519f1
commit 98cf67ddba
16 changed files with 20 additions and 20 deletions

View File

@ -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)

View File

@ -1,4 +1,4 @@
[Test]
Exec=/bin/sh -c "@pkglibexecdir@/installed-tests/children"
Exec=/bin/sh -c "@libexecdir@/installed-tests/gtk+/children"
Type=session

View File

@ -1,4 +1,4 @@
[Test]
Exec=/bin/sh -c "@pkglibexecdir@/installed-tests/derive"
Exec=/bin/sh -c "@libexecdir@/installed-tests/gtk+/derive"
Type=session

View File

@ -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

View File

@ -1,4 +1,4 @@
[Test]
Exec=/bin/sh -c "@pkglibexecdir@/installed-tests/text"
Exec=/bin/sh -c "@libexecdir@/installed-tests/gtk+/text"
Type=session

View File

@ -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

View File

@ -1,4 +1,4 @@
[Test]
Exec=/bin/sh -c "@pkglibexecdir@/installed-tests/util"
Exec=/bin/sh -c "@libexecdir@/installed-tests/gtk+/util"
Type=session

View File

@ -1,4 +1,4 @@
[Test]
Exec=/bin/sh -c "@pkglibexecdir@/installed-tests/value"
Exec=/bin/sh -c "@libexecdir@/installed-tests/gtk+/value"
Type=session

View File

@ -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)

View File

@ -1,3 +1,3 @@
[Test]
Exec=@pkglibexecdir@/installed-tests/css/api
Exec=@libexecdir@/installed-tests/gtk+/css/api
Type=session

View File

@ -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)

View File

@ -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

View File

@ -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

View File

@ -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)

View File

@ -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

View File

@ -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