diff options
| -rw-r--r-- | Makefile.am | 20 | ||||
| -rw-r--r-- | test/installable/meson.build | 4 | ||||
| -rw-r--r-- | test/meson.build | 6 | ||||
| -rw-r--r-- | test/services/TestSuitePythonService.service.in (renamed from test/TestSuitePythonService.service.in) | 0 | ||||
| -rw-r--r-- | test/services/meson.build | 5 | ||||
| -rw-r--r-- | test/tmp-session-bus.conf.in | 2 |
6 files changed, 25 insertions, 12 deletions
diff --git a/Makefile.am b/Makefile.am index 22a9386..02c03cf 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,6 +5,7 @@ abs_top_srcdir = @abs_top_srcdir@ abs_top_builddir = @abs_top_builddir@ installed_testdir = ${libexecdir}/installed-tests/${PACKAGE_TARNAME} installed_test_testdir = ${installed_testdir}/test +installed_test_servicedir = ${installed_testdir}/test/services installed_test_metadir = ${datadir}/installed-tests/${PACKAGE_TARNAME} AM_DISTCHECK_CONFIGURE_FLAGS = PYTHON=$(PYTHON) --with-python-prefix='$${prefix}' --with-python-exec-prefix='$${exec_prefix}' @@ -42,12 +43,13 @@ EXTRA_DIST = \ pyproject.toml \ setup.cfg \ setup.py \ - test/TestSuitePythonService.service.in \ test/compiled.test.in \ test/installable/meson.build \ test/meson.build \ test/py.test.in \ test/sh.test.in \ + test/services/TestSuitePythonService.service.in \ + test/services/meson.build \ test/tmp-session-bus.conf.in \ tools/check-c-style.sh \ tools/check-coding-style.mk \ @@ -291,17 +293,21 @@ TESTS = \ $(NULL) noinst_DATA = \ - test/TestSuitePythonService.service \ + test/services/TestSuitePythonService.service \ test/tmp-session-bus.conf \ $(NULL) CLEANFILES += $(noinst_DATA) installed_test_test_data = \ - test/installable/TestSuitePythonService.service \ test/installable/tmp-session-bus.conf \ $(NULL) CLEANFILES += $(installed_test_test_data) +installed_test_service_data = \ + test/installable/services/TestSuitePythonService.service \ + $(NULL) +CLEANFILES += $(installed_test_service_data) + $(noinst_DATA): test/%: test/%.in @$(MKDIR_P) $(dir $@) $(AM_V_GEN)$(SED) \ @@ -313,9 +319,14 @@ $(noinst_DATA): test/%: test/%.in $(installed_test_test_data): test/installable/%: test/%.in @$(MKDIR_P) $(dir $@) $(AM_V_GEN)$(SED) \ + -e 's|[@]G_TEST_BUILDDIR[@]|$(installed_testdir)|g' \ + $< > $@ + +$(installed_test_service_data): test/installable/%: test/%.in + @$(MKDIR_P) $(dir $@) + $(AM_V_GEN)$(SED) \ -e 's|[@]PYTHON[@]|$(PYTHON)|g' \ -e 's|[@]G_TEST_SRCDIR[@]|$(installed_testdir)|g' \ - -e 's|[@]G_TEST_BUILDDIR[@]|$(installed_testdir)|g' \ $< > $@ if ENABLE_INSTALLED_TESTS @@ -329,6 +340,7 @@ nobase_dist_installed_test_PYTHON = \ $(dist_test_extra_python) \ $(NULL) installed_test_test_DATA = $(installed_test_test_data) +installed_test_service_DATA = $(installed_test_service_data) installed_test_meta_DATA = $(installed_test_metadata) else noinst_PROGRAMS = $(test_programs) diff --git a/test/installable/meson.build b/test/installable/meson.build index 9b21425..b008c00 100644 --- a/test/installable/meson.build +++ b/test/installable/meson.build @@ -9,11 +9,11 @@ installed_test_config = { } configure_file( - input: '../TestSuitePythonService.service.in', + input: '../services/TestSuitePythonService.service.in', output: 'TestSuitePythonService.service', configuration: installed_test_config, install: true, - install_dir: installed_test_testdir, + install_dir: installed_test_testdir / 'services', ) configure_file( diff --git a/test/meson.build b/test/meson.build index a805392..0ccd6e8 100644 --- a/test/meson.build +++ b/test/meson.build @@ -43,11 +43,7 @@ build_time_test_config = { 'configure_input': 'Generated by build system, do not edit', } -configure_file( - input: 'TestSuitePythonService.service.in', - output: 'TestSuitePythonService.service', - configuration: build_time_test_config, -) +subdir('services') tmp_session_bus_conf = configure_file( input: 'tmp-session-bus.conf.in', diff --git a/test/TestSuitePythonService.service.in b/test/services/TestSuitePythonService.service.in index b9a96df..b9a96df 100644 --- a/test/TestSuitePythonService.service.in +++ b/test/services/TestSuitePythonService.service.in diff --git a/test/services/meson.build b/test/services/meson.build new file mode 100644 index 0000000..a922e74 --- /dev/null +++ b/test/services/meson.build @@ -0,0 +1,5 @@ +configure_file( + input: 'TestSuitePythonService.service.in', + output: 'TestSuitePythonService.service', + configuration: build_time_test_config, +) diff --git a/test/tmp-session-bus.conf.in b/test/tmp-session-bus.conf.in index 1d79e29..5ae1b4b 100644 --- a/test/tmp-session-bus.conf.in +++ b/test/tmp-session-bus.conf.in @@ -6,7 +6,7 @@ <type>session</type> <listen>unix:tmpdir=/tmp</listen> - <servicedir>@G_TEST_BUILDDIR@/test</servicedir> + <servicedir>@G_TEST_BUILDDIR@/test/services</servicedir> <policy context="default"> <!-- Allow everything to be sent --> |