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:
@ -97,14 +97,14 @@ test_in_files = \
|
|||||||
EXTRA_DIST += $(test_in_files) $(testdata)
|
EXTRA_DIST += $(test_in_files) $(testdata)
|
||||||
|
|
||||||
if BUILDOPT_INSTALL_TESTS
|
if BUILDOPT_INSTALL_TESTS
|
||||||
insttestdir=$(pkglibexecdir)/installed-tests
|
insttestdir=$(libexecdir)/installed-tests/$(PACKAGE)
|
||||||
insttest_PROGRAMS = $(TEST_PROGS)
|
insttest_PROGRAMS = $(TEST_PROGS)
|
||||||
|
|
||||||
a11ytestdir = $(insttestdir)/a11ytests
|
a11ytestdir = $(insttestdir)/a11ytests
|
||||||
a11ytest_DATA = $(testdata)
|
a11ytest_DATA = $(testdata)
|
||||||
|
|
||||||
substitutions = \
|
substitutions = \
|
||||||
-e s,@pkglibexecdir\@,$(pkglibexecdir),g \
|
-e s,@libexecdir\@,$(libexecdir),g \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
test_files = $(test_in_files:.test.in=.test)
|
test_files = $(test_in_files:.test.in=.test)
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
[Test]
|
[Test]
|
||||||
Exec=/bin/sh -c "@pkglibexecdir@/installed-tests/children"
|
Exec=/bin/sh -c "@libexecdir@/installed-tests/gtk+/children"
|
||||||
Type=session
|
Type=session
|
||||||
|
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
[Test]
|
[Test]
|
||||||
Exec=/bin/sh -c "@pkglibexecdir@/installed-tests/derive"
|
Exec=/bin/sh -c "@libexecdir@/installed-tests/gtk+/derive"
|
||||||
Type=session
|
Type=session
|
||||||
|
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
[Test]
|
[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
|
Type=session
|
||||||
|
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
[Test]
|
[Test]
|
||||||
Exec=/bin/sh -c "@pkglibexecdir@/installed-tests/text"
|
Exec=/bin/sh -c "@libexecdir@/installed-tests/gtk+/text"
|
||||||
Type=session
|
Type=session
|
||||||
|
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
[Test]
|
[Test]
|
||||||
Exec=/bin/sh -c "@pkglibexecdir@/installed-tests/tree-relationships"
|
Exec=/bin/sh -c "@libexecdir@/installed-tests/gtk+/tree-relationships"
|
||||||
Type=session
|
Type=session
|
||||||
|
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
[Test]
|
[Test]
|
||||||
Exec=/bin/sh -c "@pkglibexecdir@/installed-tests/util"
|
Exec=/bin/sh -c "@libexecdir@/installed-tests/gtk+/util"
|
||||||
Type=session
|
Type=session
|
||||||
|
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
[Test]
|
[Test]
|
||||||
Exec=/bin/sh -c "@pkglibexecdir@/installed-tests/value"
|
Exec=/bin/sh -c "@libexecdir@/installed-tests/gtk+/value"
|
||||||
Type=session
|
Type=session
|
||||||
|
|
||||||
|
|||||||
@ -28,11 +28,11 @@ test_in_files += api.test.in
|
|||||||
EXTRA_DIST += $(test_in_files)
|
EXTRA_DIST += $(test_in_files)
|
||||||
|
|
||||||
if BUILDOPT_INSTALL_TESTS
|
if BUILDOPT_INSTALL_TESTS
|
||||||
insttestdir=$(pkglibexecdir)/installed-tests/css
|
insttestdir=$(libexecdir)/installed-tests/$(PACKAGE)/css
|
||||||
insttest_PROGRAMS = $(TEST_PROGS)
|
insttest_PROGRAMS = $(TEST_PROGS)
|
||||||
|
|
||||||
substitutions = \
|
substitutions = \
|
||||||
-e s,@pkglibexecdir\@,$(pkglibexecdir),g \
|
-e s,@libexecdir\@,$(libexecdir),g \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
test_files = $(test_in_files:.test.in=.test)
|
test_files = $(test_in_files:.test.in=.test)
|
||||||
|
|||||||
@ -1,3 +1,3 @@
|
|||||||
[Test]
|
[Test]
|
||||||
Exec=@pkglibexecdir@/installed-tests/css/api
|
Exec=@libexecdir@/installed-tests/gtk+/css/api
|
||||||
Type=session
|
Type=session
|
||||||
|
|||||||
@ -353,12 +353,12 @@ test_data = \
|
|||||||
EXTRA_DIST += $(test_in_files) $(test_data)
|
EXTRA_DIST += $(test_in_files) $(test_data)
|
||||||
|
|
||||||
if BUILDOPT_INSTALL_TESTS
|
if BUILDOPT_INSTALL_TESTS
|
||||||
insttestdir=$(pkglibexecdir)/installed-tests/css/parser
|
insttestdir=$(libexecdir)/installed-tests/$(PACKAGE)/css/parser
|
||||||
insttest_PROGRAMS = $(TEST_PROGS)
|
insttest_PROGRAMS = $(TEST_PROGS)
|
||||||
insttest_DATA = $(test_data)
|
insttest_DATA = $(test_data)
|
||||||
|
|
||||||
substitutions = \
|
substitutions = \
|
||||||
-e s,@pkglibexecdir\@,$(pkglibexecdir),g \
|
-e s,@libexecdir\@,$(libexecdir),g \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
test_files = $(test_in_files:.test.in=.test)
|
test_files = $(test_in_files:.test.in=.test)
|
||||||
|
|||||||
@ -1,3 +1,3 @@
|
|||||||
[Test]
|
[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
|
Type=session
|
||||||
|
|||||||
@ -30,7 +30,7 @@ CLEANFILES = \
|
|||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
if BUILDOPT_INSTALL_TESTS
|
if BUILDOPT_INSTALL_TESTS
|
||||||
insttestdir=$(pkglibexecdir)/installed-tests
|
insttestdir=$(libexecdir)/installed-tests/$(PACKAGE)
|
||||||
insttest_PROGRAMS = $(TEST_PROGS)
|
insttest_PROGRAMS = $(TEST_PROGS)
|
||||||
|
|
||||||
%.test: %$(EXEEXT) Makefile
|
%.test: %$(EXEEXT) Makefile
|
||||||
|
|||||||
@ -162,7 +162,7 @@ gschemas.compiled: $(GTK_GSETTINGS_SCHEMAS)
|
|||||||
all-am: gschemas.compiled
|
all-am: gschemas.compiled
|
||||||
|
|
||||||
if BUILDOPT_INSTALL_TESTS
|
if BUILDOPT_INSTALL_TESTS
|
||||||
insttestdir = $(pkglibexecdir)/installed-tests
|
insttestdir = $(libexecdir)/installed-tests/$(PACKAGE)
|
||||||
insttest_PROGRAMS = $(TEST_PROGS)
|
insttest_PROGRAMS = $(TEST_PROGS)
|
||||||
nobase_insttest_DATA = $(test_icontheme)
|
nobase_insttest_DATA = $(test_icontheme)
|
||||||
|
|
||||||
|
|||||||
@ -344,7 +344,7 @@ EXTRA_DIST += \
|
|||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
if BUILDOPT_INSTALL_TESTS
|
if BUILDOPT_INSTALL_TESTS
|
||||||
insttestdir=$(pkglibexecdir)/installed-tests
|
insttestdir=$(libexecdir)/installed-tests/$(PACKAGE)
|
||||||
insttest_PROGRAMS = gtk-reftest
|
insttest_PROGRAMS = gtk-reftest
|
||||||
|
|
||||||
reftestdir = $(insttestdir)/reftests
|
reftestdir = $(insttestdir)/reftests
|
||||||
@ -361,7 +361,7 @@ libreftest_la_SOURCES = \
|
|||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
substitutions = \
|
substitutions = \
|
||||||
-e s,@pkglibexecdir\@,$(pkglibexecdir),g \
|
-e s,@libexecdir\@,$(libexecdir),g \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
reftests.test: reftests.test.in Makefile
|
reftests.test: reftests.test.in Makefile
|
||||||
|
|||||||
@ -1,3 +1,3 @@
|
|||||||
[Test]
|
[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
|
Type=session-exclusive
|
||||||
|
|||||||
Reference in New Issue
Block a user