summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarlos Garcia Campos <cgarcia@igalia.com>2021-04-28 13:52:09 +0200
committerCarlos Garcia Campos <carlosgc@gnome.org>2021-06-02 07:22:46 +0000
commitdac4665a0c3858dbde3f59c8ca27007b87b8231f (patch)
treeef0cb48d3723af2b8fca02cce9c34f5fcd59b4ef
parent86b0aef240a5b0e0fee546d670f060566d45091a (diff)
downloadlibsoup-dac4665a0c3858dbde3f59c8ca27007b87b8231f.tar.gz
tests: add configure_file rules for new certificate files
And move the existing ones out of the apache if, since they are also used by tests using SoupServer. This ensures the files are also in the build dir, allowing to run tests directly from the executable.
-rw-r--r--tests/meson.build25
1 files changed, 16 insertions, 9 deletions
diff --git a/tests/meson.build b/tests/meson.build
index 8ff11ca1..cb056a30 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -23,6 +23,22 @@ test_resources = gnome.compile_resources('soup-tests',
install_dir : installed_tests_execdir,
)
+configure_file(input : 'index.txt',
+ output : 'index.txt',
+ copy : true)
+configure_file(input : 'test-cert.pem',
+ output : 'test-cert.pem',
+ copy : true)
+configure_file(input : 'test-key.pem',
+ output : 'test-key.pem',
+ copy : true)
+configure_file(input : 'test-cert-2.pem',
+ output : 'test-cert-2.pem',
+ copy : true)
+configure_file(input : 'test-key-2.pem',
+ output : 'test-key-2.pem',
+ copy : true)
+
if installed_tests_enabled
install_data(
'index.txt',
@@ -119,15 +135,6 @@ if have_apache
configure_file(input : 'htpasswd',
output : 'htpasswd',
copy : true)
- configure_file(input : 'index.txt',
- output : 'index.txt',
- copy : true)
- configure_file(input : 'test-cert.pem',
- output : 'test-cert.pem',
- copy : true)
- configure_file(input : 'test-key.pem',
- output : 'test-key.pem',
- copy : true)
if installed_tests_enabled
install_data(