1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
|
From 1197f31d2b681d0cf0ca1309d50c8ab8ea80ac5e Mon Sep 17 00:00:00 2001
From: Ashok Sidipotu <ashok.sidipotu@collabora.com>
Date: Thu, 2 Dec 2021 16:57:54 +0530
Subject: [PATCH 1/2] Revert "tests: add pipewire env variables when running
tests, tidy up common_env"
This reverts commit c24db9f3539f9b7ebe9e74c991cc3037f28ea22c.
Upstream-Status: Inappropriate[meson version dependent]
---
tests/meson.build | 31 -------------------------------
tests/modules/meson.build | 9 ++++++---
tests/wp/meson.build | 10 +++++++---
tests/wplua/meson.build | 15 +++++++++++----
4 files changed, 24 insertions(+), 41 deletions(-)
diff --git a/tests/meson.build b/tests/meson.build
index 0e06568..9238d5b 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -28,37 +28,6 @@ if valgrind.found()
timeout_multiplier: 2)
endif
-# The common test environment
-common_test_env = environment({
- 'HOME': '/invalid',
- 'XDG_RUNTIME_DIR': '/invalid',
- 'PIPEWIRE_RUNTIME_DIR': '/tmp',
- 'XDG_CONFIG_HOME': meson.current_build_dir() / '.config',
- 'XDG_STATE_HOME': meson.current_build_dir() / '.local' / 'state',
- 'FILE_MONITOR_DIR': meson.current_build_dir() / '.local' / 'file_monitor',
- 'WIREPLUMBER_CONFIG_DIR': '/invalid',
- 'WIREPLUMBER_DATA_DIR': '/invalid',
- 'WIREPLUMBER_MODULE_DIR': meson.current_build_dir() / '..' / 'modules',
- 'WIREPLUMBER_DEBUG': '7',
-})
-
-spa_plugindir = spa_dep.get_variable(
- pkgconfig: 'plugindir', internal: 'plugindir', default_value: '')
-pipewire_moduledir = pipewire_dep.get_variable(
- pkgconfig: 'moduledir', internal: 'moduledir', default_value: '')
-pipewire_confdatadir = pipewire_dep.get_variable(
- pkgconfig: 'confdatadir', internal: 'confdatadir', default_value: '')
-
-if spa_plugindir != ''
- common_test_env.set('SPA_PLUGIN_DIR', spa_plugindir)
-endif
-if pipewire_moduledir != ''
- common_test_env.set('PIPEWIRE_MODULE_DIR', pipewire_moduledir)
-endif
-if pipewire_confdatadir != ''
- common_test_env.set('PIPEWIRE_CONFIG_DIR', pipewire_confdatadir)
-endif
-
subdir('wp')
subdir('wplua')
subdir('modules')
diff --git a/tests/modules/meson.build b/tests/modules/meson.build
index ffab80b..2fc46dc 100644
--- a/tests/modules/meson.build
+++ b/tests/modules/meson.build
@@ -1,7 +1,10 @@
common_deps = [gobject_dep, gio_dep, wp_dep, pipewire_dep]
-common_env = common_test_env
-common_env.set('G_TEST_SRCDIR', meson.current_source_dir())
-common_env.set('G_TEST_BUILDDIR', meson.current_build_dir())
+common_env = environment({
+ 'G_TEST_SRCDIR': meson.current_source_dir(),
+ 'G_TEST_BUILDDIR': meson.current_build_dir(),
+ 'WIREPLUMBER_MODULE_DIR': meson.current_build_dir() / '..' / '..' / 'modules',
+ 'WIREPLUMBER_DEBUG': '7',
+})
common_args = [
'-DG_LOG_USE_STRUCTURED',
]
diff --git a/tests/wp/meson.build b/tests/wp/meson.build
index 178564d..b64ccae 100644
--- a/tests/wp/meson.build
+++ b/tests/wp/meson.build
@@ -1,7 +1,11 @@
common_deps = [gobject_dep, gio_dep, wp_dep, pipewire_dep]
-common_env = common_test_env
-common_env.set('G_TEST_SRCDIR', meson.current_source_dir())
-common_env.set('G_TEST_BUILDDIR', meson.current_build_dir())
+common_env = environment({
+ 'G_TEST_SRCDIR': meson.current_source_dir(),
+ 'G_TEST_BUILDDIR': meson.current_build_dir(),
+ 'XDG_CONFIG_HOME': meson.current_build_dir() / '.config',
+ 'WIREPLUMBER_MODULE_DIR': meson.current_build_dir() / '..' / '..' / 'modules',
+ 'WIREPLUMBER_DEBUG': '7',
+})
common_args = [
'-DG_LOG_USE_STRUCTURED',
]
diff --git a/tests/wplua/meson.build b/tests/wplua/meson.build
index a7ff033..fcf4b51 100644
--- a/tests/wplua/meson.build
+++ b/tests/wplua/meson.build
@@ -1,13 +1,18 @@
common_deps = [wplua_dep, pipewire_dep, wp_dep]
-common_env = common_test_env
-common_env.set('G_TEST_SRCDIR', meson.current_source_dir())
-common_env.set('G_TEST_BUILDDIR', meson.current_build_dir())
-common_env.set('WIREPLUMBER_DATA_DIR', meson.current_source_dir())
+common_env = environment({
+ 'G_TEST_SRCDIR': meson.current_source_dir(),
+ 'G_TEST_BUILDDIR': meson.current_build_dir(),
+ 'WIREPLUMBER_CONFIG_DIR': '/invalid',
+ 'WIREPLUMBER_DATA_DIR': meson.current_source_dir(),
+ 'WIREPLUMBER_MODULE_DIR': meson.current_build_dir() / '..' / '..' / 'modules',
+ 'WIREPLUMBER_DEBUG': '7',
+})
test(
'test-wplua',
executable('test-wplua', 'wplua.c', dependencies: common_deps),
env: common_env,
+ workdir : meson.current_source_dir(),
)
script_tester = executable('script-tester',
@@ -20,6 +25,7 @@ test(
script_tester,
args: ['pod.lua'],
env: common_env,
+ workdir : meson.current_source_dir(),
)
test(
'test-lua-json',
@@ -32,4 +38,5 @@ test(
script_tester,
args: ['monitor-rules.lua'],
env: common_env,
+ workdir : meson.current_source_dir(),
)
--
2.35.1
|
