diff options
author | Jonathan Rajotte <jonathan.rajotte-julien@efficios.com> | 2019-04-04 21:47:40 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-04-05 17:32:50 +0100 |
commit | 8e9a0fe61f0ccdad8d88ecf8f46ae90c0c73da97 (patch) | |
tree | 01d9bf650a0d9b5524eb7eed975a2957db8ff501 /meta/recipes-kernel/lttng/lttng-tools/0004-Skip-when-testapp-is-not-present.patch | |
parent | bb1940a0d65660a967b1f126ce3cbd89314d1e3b (diff) | |
download | poky-8e9a0fe61f0ccdad8d88ecf8f46ae90c0c73da97.tar.gz |
lttng-tools: improve ptest and test suite
Multiple patches are to be applied to improve the current ptest suite.
0001-Fix-tests-link-libpause_consumer-on-liblttng-ctl.patch
0002-Fix-test-skip-test_getcpu_override-on-single-thread-.patch
0003-Fix-test-unit-the-tree-origin-can-be-a-symlink-itsel.patch
0006-Tests-check-for-lttng-modules-presence.patch
All deal with problem in the test suite. Most of these are already
accepted upstream and will be removed on the next recipe update.
0004-Skip-when-testapp-is-not-present.patch
Is a OE specific fix that make sure that we skip the test if
the test util application (event generator) is not present. We are
still unsure on how (upstream) we are going to solve this problem. We
already have this problem if a user build lttng without lttng-ust
(--without-lttng-ust). We will most probably end up splitting each test
into kernel and userspace tests and adjust the makefile accordingly.
Another option is to probe lttng for enabled function at runtime.
0005-Tests-use-modprobe-to-test-for-the-presence-of-lttng.patch
Is a requirement for 0006 that should be accepted upstream shorlty.
0007-Fix-getgrnam-is-not-MT-Safe-use-getgrnam_r.patch
Fixes a race found while testing OE built with musl. This is a legit
bug. The fixes or a variant should be accepted soon.
(From OE-Core rev: 57db7be54b9ee21b2be33b83782f0636d0702168)
Signed-off-by: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel/lttng/lttng-tools/0004-Skip-when-testapp-is-not-present.patch')
-rw-r--r-- | meta/recipes-kernel/lttng/lttng-tools/0004-Skip-when-testapp-is-not-present.patch | 610 |
1 files changed, 610 insertions, 0 deletions
diff --git a/meta/recipes-kernel/lttng/lttng-tools/0004-Skip-when-testapp-is-not-present.patch b/meta/recipes-kernel/lttng/lttng-tools/0004-Skip-when-testapp-is-not-present.patch new file mode 100644 index 0000000000..6c9f7e462c --- /dev/null +++ b/meta/recipes-kernel/lttng/lttng-tools/0004-Skip-when-testapp-is-not-present.patch | |||
@@ -0,0 +1,610 @@ | |||
1 | From 95c27e6acceaeda55c729b9e92e594322adef13f Mon Sep 17 00:00:00 2001 | ||
2 | From: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com> | ||
3 | Date: Wed, 3 Apr 2019 16:31:18 -0400 | ||
4 | Subject: [PATCH lttng-tools] Skip when testapp is not present | ||
5 | |||
6 | We expect lttng-ust do be present, this is a wrong assumptions. | ||
7 | |||
8 | This is a quick fix. The real fix is to either detect at runtime | ||
9 | lttng-ust support or at build time (HAVE_LIBLTTNG_UST_CTL). | ||
10 | |||
11 | This prevent hang for make check done on a build configured with | ||
12 | --without-lttng-ust. | ||
13 | |||
14 | Upstream-Status: Inappropriate [other] | ||
15 | Reason: This patch is inappropriate for upstream for 2.10 stable release | ||
16 | since we do not backport "superficial" fix to the test suite. We do | ||
17 | backport when a test is broken. The fact that on --without-lttng-ust | ||
18 | hang is not a "broken" test per-see. Still, a variation of this fix will | ||
19 | be upstreamed in our master branch and possibly 2.11. The upstreamed | ||
20 | version will split the test in kernel/ust test and skip them at the | ||
21 | build system level. This patch is more succinct. | ||
22 | |||
23 | Signed-off-by: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com> | ||
24 | --- | ||
25 | tests/regression/tools/crash/test_crash | 4 ++ | ||
26 | .../regression/tools/exclusion/test_exclusion | 4 ++ | ||
27 | .../tools/filtering/test_valid_filter | 21 ++++-- | ||
28 | tests/regression/tools/health/test_thread_ok | 29 +++++--- | ||
29 | tests/regression/tools/live/Makefile.am | 2 - | ||
30 | tests/regression/tools/live/test_lttng_ust | 4 ++ | ||
31 | tests/regression/tools/live/test_ust | 4 ++ | ||
32 | .../tools/live/test_ust_tracefile_count | 4 ++ | ||
33 | tests/regression/tools/mi/test_mi | 4 ++ | ||
34 | .../notification/test_notification_multi_app | 18 +++-- | ||
35 | .../tools/notification/test_notification_ust | 4 ++ | ||
36 | .../regression/tools/regen-metadata/test_ust | 2 +- | ||
37 | .../regression/tools/regen-statedump/test_ust | 2 +- | ||
38 | .../regression/tools/save-load/test_autoload | 7 ++ | ||
39 | tests/regression/tools/save-load/test_load | 8 +++ | ||
40 | tests/regression/tools/save-load/test_save | 7 ++ | ||
41 | .../regression/tools/snapshots/test_ust_fast | 2 +- | ||
42 | .../regression/tools/snapshots/test_ust_long | 2 +- | ||
43 | .../tools/snapshots/test_ust_streaming | 2 +- | ||
44 | tests/regression/tools/snapshots/ust_test | 2 +- | ||
45 | .../streaming/test_high_throughput_limits | 2 +- | ||
46 | tests/regression/tools/streaming/test_ust | 2 +- | ||
47 | .../tracefile-limits/test_tracefile_count | 2 +- | ||
48 | .../tracefile-limits/test_tracefile_size | 2 +- | ||
49 | .../tools/wildcard/test_event_wildcard | 67 ++++++++++--------- | ||
50 | 25 files changed, 147 insertions(+), 60 deletions(-) | ||
51 | |||
52 | diff --git a/tests/regression/tools/crash/test_crash b/tests/regression/tools/crash/test_crash | ||
53 | index 8c62c513d..3cbe97688 100755 | ||
54 | --- a/tests/regression/tools/crash/test_crash | ||
55 | +++ b/tests/regression/tools/crash/test_crash | ||
56 | @@ -35,6 +35,10 @@ NUM_TESTS=77 | ||
57 | |||
58 | source $TESTDIR/utils/utils.sh | ||
59 | |||
60 | +if [ ! -x "$TESTAPP_BIN" ]; then | ||
61 | + plan_skip_all "No UST events binary detected." | ||
62 | +fi | ||
63 | + | ||
64 | # Global declaration for simplification | ||
65 | LTTNG_CRASH=$TESTDIR/../src/bin/lttng-crash/$CRASH_BIN | ||
66 | |||
67 | diff --git a/tests/regression/tools/exclusion/test_exclusion b/tests/regression/tools/exclusion/test_exclusion | ||
68 | index 949cd41df..42e4d72fb 100755 | ||
69 | --- a/tests/regression/tools/exclusion/test_exclusion | ||
70 | +++ b/tests/regression/tools/exclusion/test_exclusion | ||
71 | @@ -30,6 +30,10 @@ NUM_TESTS=149 | ||
72 | |||
73 | source $TESTDIR/utils/utils.sh | ||
74 | |||
75 | +if [ ! -x "$TESTAPP_BIN" ]; then | ||
76 | + plan_skip_all "No UST events binary detected." | ||
77 | +fi | ||
78 | + | ||
79 | function enable_ust_lttng_all_event_exclusion() | ||
80 | { | ||
81 | sess_name="$1" | ||
82 | diff --git a/tests/regression/tools/filtering/test_valid_filter b/tests/regression/tools/filtering/test_valid_filter | ||
83 | index 163b32182..1e8da630b 100755 | ||
84 | --- a/tests/regression/tools/filtering/test_valid_filter | ||
85 | +++ b/tests/regression/tools/filtering/test_valid_filter | ||
86 | @@ -418,12 +418,18 @@ issue_356_filter+="intfield > 4 && intfield > 5 && " | ||
87 | issue_356_filter+="intfield > 6 && intfield > 7 && " | ||
88 | issue_356_filter+="intfield > 8 || intfield > 0" | ||
89 | |||
90 | +BIN_NAME="gen-ust-events" | ||
91 | + | ||
92 | +skip_ust=1 | ||
93 | +if [ ! -x "$CURDIR/$BIN_NAME" ]; then | ||
94 | + skip_ust=0 | ||
95 | + skip 0 "No UST nevents binary detected." $NUM_UST_TESTS | ||
96 | +fi | ||
97 | + | ||
98 | start_lttng_sessiond | ||
99 | |||
100 | ### UST TESTS | ||
101 | |||
102 | -BIN_NAME="gen-ust-events" | ||
103 | - | ||
104 | KIRK_KRAUSS_TESTS=( | ||
105 | # the tests below were written by Kirk Krauss in this article: | ||
106 | # http://www.drdobbs.com/architecture-and-design/matching-wildcards-an-empirical-way-to-t/240169123 | ||
107 | @@ -897,9 +903,6 @@ UST_STR_FILTERS=( | ||
108 | END | ||
109 | ) | ||
110 | |||
111 | -if [ ! -x "$CURDIR/$BIN_NAME" ]; then | ||
112 | - BAIL_OUT "No UST nevents binary detected." | ||
113 | -fi | ||
114 | |||
115 | IFS="$OLDIFS" | ||
116 | |||
117 | @@ -910,6 +913,10 @@ i=0 | ||
118 | while true; do | ||
119 | validator="${UST_FILTERS[$i]}" | ||
120 | |||
121 | + if [ $skip_ust -eq 0 ]; then | ||
122 | + break | ||
123 | + fi | ||
124 | + | ||
125 | if [ "$validator" = END ]; then | ||
126 | break | ||
127 | fi | ||
128 | @@ -929,6 +936,10 @@ i=0 | ||
129 | while true; do | ||
130 | validator="${UST_STR_FILTERS[$i]}" | ||
131 | |||
132 | + if [ $skip_ust -eq 0 ]; then | ||
133 | + break | ||
134 | + fi | ||
135 | + | ||
136 | if [ "$validator" = END ]; then | ||
137 | break | ||
138 | fi | ||
139 | diff --git a/tests/regression/tools/health/test_thread_ok b/tests/regression/tools/health/test_thread_ok | ||
140 | index e81d6ed24..849b7e71f 100755 | ||
141 | --- a/tests/regression/tools/health/test_thread_ok | ||
142 | +++ b/tests/regression/tools/health/test_thread_ok | ||
143 | @@ -27,6 +27,9 @@ CHANNEL_NAME="testchan" | ||
144 | HEALTH_CHECK_BIN="health_check" | ||
145 | NUM_TESTS=17 | ||
146 | SLEEP_TIME=30 | ||
147 | +TESTAPP_PATH="$TESTDIR/utils/testapp" | ||
148 | +TESTAPP_NAME="gen-ust-events" | ||
149 | +TESTAPP_BIN="$TESTAPP_PATH/$TESTAPP_NAME/$TESTAPP_NAME" | ||
150 | |||
151 | source $TESTDIR/utils/utils.sh | ||
152 | |||
153 | @@ -76,15 +79,19 @@ function test_thread_ok | ||
154 | $CURDIR/$HEALTH_CHECK_BIN > ${STDOUT_PATH} 2> ${STDERR_PATH} | ||
155 | report_errors | ||
156 | |||
157 | - diag "With UST consumer daemons" | ||
158 | - create_lttng_session_no_output $SESSION_NAME | ||
159 | - enable_ust_lttng_event_ok $SESSION_NAME $UST_EVENT_NAME $CHANNEL_NAME | ||
160 | - start_lttng_tracing_ok $SESSION_NAME | ||
161 | - destroy_lttng_session_ok $SESSION_NAME | ||
162 | + skip $skip_ust "Ust does not seems to be supported" "5" || | ||
163 | + { | ||
164 | + diag "With UST consumer daemons" | ||
165 | + create_lttng_session_no_output $SESSION_NAME | ||
166 | + enable_ust_lttng_event_ok $SESSION_NAME $UST_EVENT_NAME $CHANNEL_NAME | ||
167 | + start_lttng_tracing_ok $SESSION_NAME | ||
168 | + destroy_lttng_session_ok $SESSION_NAME | ||
169 | |||
170 | - # Check health status | ||
171 | - $CURDIR/$HEALTH_CHECK_BIN > ${STDOUT_PATH} 2> ${STDERR_PATH} | ||
172 | - report_errors | ||
173 | + | ||
174 | + # Check health status | ||
175 | + $CURDIR/$HEALTH_CHECK_BIN > ${STDOUT_PATH} 2> ${STDERR_PATH} | ||
176 | + report_errors | ||
177 | + } | ||
178 | |||
179 | skip $isroot "Root access is needed. Skipping kernel consumer health check test." "5" || | ||
180 | { | ||
181 | @@ -141,6 +148,12 @@ else | ||
182 | isroot=0 | ||
183 | fi | ||
184 | |||
185 | +if [ ! -x "$TESTAPP_BIN" ]; then | ||
186 | + skip_ust=0 | ||
187 | +else | ||
188 | + skip_ust=1 | ||
189 | +fi | ||
190 | + | ||
191 | test_thread_ok | ||
192 | |||
193 | rm -rf ${HEALTH_PATH} | ||
194 | diff --git a/tests/regression/tools/live/Makefile.am b/tests/regression/tools/live/Makefile.am | ||
195 | index 46186d383..db74de8d5 100644 | ||
196 | --- a/tests/regression/tools/live/Makefile.am | ||
197 | +++ b/tests/regression/tools/live/Makefile.am | ||
198 | @@ -16,9 +16,7 @@ LIVE=$(top_builddir)/src/bin/lttng-sessiond/session.$(OBJEXT) \ | ||
199 | noinst_PROGRAMS = live_test | ||
200 | EXTRA_DIST = test_kernel test_lttng_kernel | ||
201 | |||
202 | -if HAVE_LIBLTTNG_UST_CTL | ||
203 | EXTRA_DIST += test_ust test_ust_tracefile_count test_lttng_ust | ||
204 | -endif | ||
205 | |||
206 | live_test_SOURCES = live_test.c | ||
207 | live_test_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBRELAYD) $(LIBSESSIOND_COMM) \ | ||
208 | diff --git a/tests/regression/tools/live/test_lttng_ust b/tests/regression/tools/live/test_lttng_ust | ||
209 | index 06017d01d..be9b3d7f7 100755 | ||
210 | --- a/tests/regression/tools/live/test_lttng_ust | ||
211 | +++ b/tests/regression/tools/live/test_lttng_ust | ||
212 | @@ -38,6 +38,10 @@ NUM_TESTS=12 | ||
213 | |||
214 | source $TESTDIR/utils/utils.sh | ||
215 | |||
216 | +if [ ! -x "$TESTAPP_BIN" ]; then | ||
217 | + plan_skip_all "No UST events binary detected." | ||
218 | +fi | ||
219 | + | ||
220 | # MUST set TESTDIR before calling those functions | ||
221 | plan_tests $NUM_TESTS | ||
222 | |||
223 | diff --git a/tests/regression/tools/live/test_ust b/tests/regression/tools/live/test_ust | ||
224 | index 0384a706f..add521bfc 100755 | ||
225 | --- a/tests/regression/tools/live/test_ust | ||
226 | +++ b/tests/regression/tools/live/test_ust | ||
227 | @@ -36,6 +36,10 @@ DIR=$(readlink -f $TESTDIR) | ||
228 | |||
229 | source $TESTDIR/utils/utils.sh | ||
230 | |||
231 | +if [ ! -x "$TESTAPP_BIN" ]; then | ||
232 | + plan_skip_all "No UST events binary detected." | ||
233 | +fi | ||
234 | + | ||
235 | echo "$TEST_DESC" | ||
236 | |||
237 | function setup_live_tracing() | ||
238 | diff --git a/tests/regression/tools/live/test_ust_tracefile_count b/tests/regression/tools/live/test_ust_tracefile_count | ||
239 | index 6da368fc6..10504f8c6 100755 | ||
240 | --- a/tests/regression/tools/live/test_ust_tracefile_count | ||
241 | +++ b/tests/regression/tools/live/test_ust_tracefile_count | ||
242 | @@ -36,6 +36,10 @@ DIR=$(readlink -f $TESTDIR) | ||
243 | |||
244 | source $TESTDIR/utils/utils.sh | ||
245 | |||
246 | +if [ ! -x "$TESTAPP_BIN" ]; then | ||
247 | + plan_skip_all "No UST events binary detected." | ||
248 | +fi | ||
249 | + | ||
250 | echo "$TEST_DESC" | ||
251 | |||
252 | function setup_live_tracing() | ||
253 | diff --git a/tests/regression/tools/mi/test_mi b/tests/regression/tools/mi/test_mi | ||
254 | index 48dda7da6..2cc30b29a 100755 | ||
255 | --- a/tests/regression/tools/mi/test_mi | ||
256 | +++ b/tests/regression/tools/mi/test_mi | ||
257 | @@ -61,6 +61,10 @@ NUM_TESTS=228 | ||
258 | |||
259 | source $TESTDIR/utils/utils.sh | ||
260 | |||
261 | +if [ ! -x "$TESTAPP_BIN" ]; then | ||
262 | + plan_skip_all "No UST events binary detected." | ||
263 | +fi | ||
264 | + | ||
265 | #Overwrite the lttng_bin to get mi output | ||
266 | LTTNG_BIN="lttng --mi xml" | ||
267 | |||
268 | diff --git a/tests/regression/tools/notification/test_notification_multi_app b/tests/regression/tools/notification/test_notification_multi_app | ||
269 | index 0a05ea6a0..29b0f62fa 100755 | ||
270 | --- a/tests/regression/tools/notification/test_notification_multi_app | ||
271 | +++ b/tests/regression/tools/notification/test_notification_multi_app | ||
272 | @@ -52,6 +52,11 @@ plan_tests $NUM_TESTS | ||
273 | |||
274 | print_test_banner "$TEST_DESC" | ||
275 | |||
276 | +skip_ust=1 | ||
277 | +if [ ! -x "$TESTAPP_BIN" ]; then | ||
278 | + skip_ust=0 | ||
279 | +fi | ||
280 | + | ||
281 | app_pids=() | ||
282 | |||
283 | function kernel_event_generator_toogle_state | ||
284 | @@ -468,10 +473,15 @@ function test_on_register_evaluation () | ||
285 | } | ||
286 | |||
287 | |||
288 | -TESTS=( | ||
289 | - test_multi_app_ust | ||
290 | - test_on_register_evaluation_ust | ||
291 | -) | ||
292 | +TESTS=() | ||
293 | +if [ $skip_ust -eq "1" ]; then | ||
294 | + TESTS+=( | ||
295 | + test_multi_app_ust | ||
296 | + test_on_register_evaluation_ust | ||
297 | + ) | ||
298 | +else | ||
299 | + skip 0 "No UST events binary detected." $NUM_TEST_UST | ||
300 | +fi | ||
301 | |||
302 | if [ "$(id -u)" == "0" ]; then | ||
303 | TESTS+=( | ||
304 | diff --git a/tests/regression/tools/notification/test_notification_ust b/tests/regression/tools/notification/test_notification_ust | ||
305 | index 8941e476d..eb2e15cad 100755 | ||
306 | --- a/tests/regression/tools/notification/test_notification_ust | ||
307 | +++ b/tests/regression/tools/notification/test_notification_ust | ||
308 | @@ -46,6 +46,10 @@ DIR=$(readlink -f $TESTDIR) | ||
309 | |||
310 | source $TESTDIR/utils/utils.sh | ||
311 | |||
312 | +if [ ! -x "$TESTAPP_BIN" ]; then | ||
313 | + plan_skip_all "No UST events binary detected." | ||
314 | +fi | ||
315 | + | ||
316 | function ust_event_generator_toogle_state | ||
317 | { | ||
318 | ust_event_generator_suspended=$((ust_event_generator_suspended==0)) | ||
319 | diff --git a/tests/regression/tools/regen-metadata/test_ust b/tests/regression/tools/regen-metadata/test_ust | ||
320 | index b7f1af1d8..312c8a40d 100755 | ||
321 | --- a/tests/regression/tools/regen-metadata/test_ust | ||
322 | +++ b/tests/regression/tools/regen-metadata/test_ust | ||
323 | @@ -34,7 +34,7 @@ NUM_TESTS=33 | ||
324 | source $TESTDIR/utils/utils.sh | ||
325 | |||
326 | if [ ! -x "$TESTAPP_BIN" ]; then | ||
327 | - BAIL_OUT "No UST events binary detected." | ||
328 | + plan_skip_all "No UST events binary detected." | ||
329 | fi | ||
330 | |||
331 | function lttng_create_session_uri | ||
332 | diff --git a/tests/regression/tools/regen-statedump/test_ust b/tests/regression/tools/regen-statedump/test_ust | ||
333 | index 486b9a560..8d455b26a 100755 | ||
334 | --- a/tests/regression/tools/regen-statedump/test_ust | ||
335 | +++ b/tests/regression/tools/regen-statedump/test_ust | ||
336 | @@ -34,7 +34,7 @@ NUM_TESTS=11 | ||
337 | source $TESTDIR/utils/utils.sh | ||
338 | |||
339 | if [ ! -x "$TESTAPP_BIN" ]; then | ||
340 | - BAIL_OUT "No UST events binary detected." | ||
341 | + plan_skip_all "No UST events binary detected." | ||
342 | fi | ||
343 | |||
344 | function test_ust_local () | ||
345 | diff --git a/tests/regression/tools/save-load/test_autoload b/tests/regression/tools/save-load/test_autoload | ||
346 | index 7ee5e9906..ec376cfb3 100755 | ||
347 | --- a/tests/regression/tools/save-load/test_autoload | ||
348 | +++ b/tests/regression/tools/save-load/test_autoload | ||
349 | @@ -21,6 +21,9 @@ CURDIR=$(dirname $0)/ | ||
350 | CONFIG_DIR="${CURDIR}/configuration" | ||
351 | TESTDIR=$CURDIR/../../../ | ||
352 | export LTTNG_SESSION_CONFIG_XSD_PATH=$(readlink -m ${TESTDIR}../src/common/config/) | ||
353 | +TESTAPP_PATH="$TESTDIR/utils/testapp" | ||
354 | +TESTAPP_NAME="gen-ust-events" | ||
355 | +TESTAPP_BIN="$TESTAPP_PATH/$TESTAPP_NAME/$TESTAPP_NAME" | ||
356 | |||
357 | DIR=$(readlink -f $TESTDIR) | ||
358 | |||
359 | @@ -28,6 +31,10 @@ NUM_TESTS=9 | ||
360 | |||
361 | source $TESTDIR/utils/utils.sh | ||
362 | |||
363 | +if [ ! -x "$TESTAPP_BIN" ]; then | ||
364 | + plan_skip_all "No UST events binary detected." | ||
365 | +fi | ||
366 | + | ||
367 | # MUST set TESTDIR before calling those functions | ||
368 | plan_tests $NUM_TESTS | ||
369 | |||
370 | diff --git a/tests/regression/tools/save-load/test_load b/tests/regression/tools/save-load/test_load | ||
371 | index 5e38b46b6..b6fdd8192 100755 | ||
372 | --- a/tests/regression/tools/save-load/test_load | ||
373 | +++ b/tests/regression/tools/save-load/test_load | ||
374 | @@ -20,6 +20,10 @@ TEST_DESC="Load session(s)" | ||
375 | CURDIR=$(dirname $0)/ | ||
376 | CONFIG_DIR="${CURDIR}/configuration" | ||
377 | TESTDIR=$CURDIR/../../../ | ||
378 | +TESTAPP_PATH="$TESTDIR/utils/testapp" | ||
379 | +TESTAPP_NAME="gen-ust-events" | ||
380 | +TESTAPP_BIN="$TESTAPP_PATH/$TESTAPP_NAME/$TESTAPP_NAME" | ||
381 | + | ||
382 | export LTTNG_SESSION_CONFIG_XSD_PATH=$(readlink -m ${TESTDIR}../src/common/config/) | ||
383 | |||
384 | SESSION_NAME="load-42" | ||
385 | @@ -31,6 +35,10 @@ NUM_TESTS=67 | ||
386 | |||
387 | source $TESTDIR/utils/utils.sh | ||
388 | |||
389 | +if [ ! -x "$TESTAPP_BIN" ]; then | ||
390 | + plan_skip_all "No UST events binary detected." | ||
391 | +fi | ||
392 | + | ||
393 | # MUST set TESTDIR before calling those functions | ||
394 | plan_tests $NUM_TESTS | ||
395 | |||
396 | diff --git a/tests/regression/tools/save-load/test_save b/tests/regression/tools/save-load/test_save | ||
397 | index c5f6b1341..cfaf67b7a 100755 | ||
398 | --- a/tests/regression/tools/save-load/test_save | ||
399 | +++ b/tests/regression/tools/save-load/test_save | ||
400 | @@ -23,6 +23,9 @@ TESTDIR=$CURDIR/../../../ | ||
401 | SESSION_NAME="save-42" | ||
402 | CHANNEL_NAME="chan-save" | ||
403 | EVENT_NAME="tp:tptest" | ||
404 | +TESTAPP_PATH="$TESTDIR/utils/testapp" | ||
405 | +TESTAPP_NAME="gen-ust-events" | ||
406 | +TESTAPP_BIN="$TESTAPP_PATH/$TESTAPP_NAME/$TESTAPP_NAME" | ||
407 | |||
408 | DIR=$(readlink -f $TESTDIR) | ||
409 | |||
410 | @@ -30,6 +33,10 @@ NUM_TESTS=41 | ||
411 | |||
412 | source $TESTDIR/utils/utils.sh | ||
413 | |||
414 | +if [ ! -x "TESTAPP_BIN" ]; then | ||
415 | + plan_skip_all "No UST events binary detected." | ||
416 | +fi | ||
417 | + | ||
418 | # MUST set TESTDIR before calling those functions | ||
419 | plan_tests $NUM_TESTS | ||
420 | |||
421 | diff --git a/tests/regression/tools/snapshots/test_ust_fast b/tests/regression/tools/snapshots/test_ust_fast | ||
422 | index edb435c52..5a68ec56d 100755 | ||
423 | --- a/tests/regression/tools/snapshots/test_ust_fast | ||
424 | +++ b/tests/regression/tools/snapshots/test_ust_fast | ||
425 | @@ -23,7 +23,7 @@ TEST_BIN="ust_test" | ||
426 | source $TESTDIR/utils/utils.sh | ||
427 | |||
428 | if [ ! -x "$CURDIR/$TEST_BIN" ]; then | ||
429 | - BAIL_OUT "No UST test found: $TEST_BIN" | ||
430 | + plan_skip_all "No UST test found: $TEST_BIN" | ||
431 | fi | ||
432 | |||
433 | ./$CURDIR/$TEST_BIN $NR_SNAPSHOT | ||
434 | diff --git a/tests/regression/tools/snapshots/test_ust_long b/tests/regression/tools/snapshots/test_ust_long | ||
435 | index 9e1a0c262..afa019f6a 100755 | ||
436 | --- a/tests/regression/tools/snapshots/test_ust_long | ||
437 | +++ b/tests/regression/tools/snapshots/test_ust_long | ||
438 | @@ -23,7 +23,7 @@ TEST_BIN="ust_test" | ||
439 | source $TESTDIR/utils/utils.sh | ||
440 | |||
441 | if [ ! -x "$CURDIR/$TEST_BIN" ]; then | ||
442 | - BAIL_OUT "No UST test found: $TEST_BIN" | ||
443 | + plan_skip_all "No UST test found: $TEST_BIN" | ||
444 | fi | ||
445 | |||
446 | ./$CURDIR/$TEST_BIN $NR_SNAPSHOT | ||
447 | diff --git a/tests/regression/tools/snapshots/test_ust_streaming b/tests/regression/tools/snapshots/test_ust_streaming | ||
448 | index 93b0957f3..69291ab4d 100755 | ||
449 | --- a/tests/regression/tools/snapshots/test_ust_streaming | ||
450 | +++ b/tests/regression/tools/snapshots/test_ust_streaming | ||
451 | @@ -37,7 +37,7 @@ NUM_TESTS=75 | ||
452 | source $TESTDIR/utils/utils.sh | ||
453 | |||
454 | if [ ! -x "$TESTAPP_BIN" ]; then | ||
455 | - BAIL_OUT "No UST events binary detected." | ||
456 | + plan_skip_all "No UST events binary detected." | ||
457 | fi | ||
458 | |||
459 | function snapshot_add_output () | ||
460 | diff --git a/tests/regression/tools/snapshots/ust_test b/tests/regression/tools/snapshots/ust_test | ||
461 | index 755cef9e0..92f9f6cff 100755 | ||
462 | --- a/tests/regression/tools/snapshots/ust_test | ||
463 | +++ b/tests/regression/tools/snapshots/ust_test | ||
464 | @@ -34,7 +34,7 @@ TRACE_PATH=$(mktemp -d) | ||
465 | source $TESTDIR/utils/utils.sh | ||
466 | |||
467 | if [ ! -x "$TESTAPP_BIN" ]; then | ||
468 | - BAIL_OUT "No UST events binary detected." | ||
469 | + plan_skip_all "No UST events binary detected." | ||
470 | fi | ||
471 | |||
472 | # Need the number of snapshot to do. | ||
473 | diff --git a/tests/regression/tools/streaming/test_high_throughput_limits b/tests/regression/tools/streaming/test_high_throughput_limits | ||
474 | index 32c3f1f2b..f54178923 100755 | ||
475 | --- a/tests/regression/tools/streaming/test_high_throughput_limits | ||
476 | +++ b/tests/regression/tools/streaming/test_high_throughput_limits | ||
477 | @@ -38,7 +38,7 @@ NUM_TESTS=104 | ||
478 | source $TESTDIR/utils/utils.sh | ||
479 | |||
480 | if [ ! -x "$TESTAPP_BIN" ]; then | ||
481 | - BAIL_OUT "No UST events binary detected." | ||
482 | + plan_skip_all "No UST events binary detected." | ||
483 | fi | ||
484 | |||
485 | function set_bw_limit | ||
486 | diff --git a/tests/regression/tools/streaming/test_ust b/tests/regression/tools/streaming/test_ust | ||
487 | index a5d5b5e92..e1dd98ee7 100755 | ||
488 | --- a/tests/regression/tools/streaming/test_ust | ||
489 | +++ b/tests/regression/tools/streaming/test_ust | ||
490 | @@ -34,7 +34,7 @@ NUM_TESTS=16 | ||
491 | source $TESTDIR/utils/utils.sh | ||
492 | |||
493 | if [ ! -x "$TESTAPP_BIN" ]; then | ||
494 | - BAIL_OUT "No UST events binary detected." | ||
495 | + plan_skip_all "No UST events binary detected." | ||
496 | fi | ||
497 | |||
498 | function lttng_create_session_uri | ||
499 | diff --git a/tests/regression/tools/tracefile-limits/test_tracefile_count b/tests/regression/tools/tracefile-limits/test_tracefile_count | ||
500 | index 6ada8580f..7553c7d1f 100755 | ||
501 | --- a/tests/regression/tools/tracefile-limits/test_tracefile_count | ||
502 | +++ b/tests/regression/tools/tracefile-limits/test_tracefile_count | ||
503 | @@ -33,7 +33,7 @@ PAGE_SIZE=$(getconf PAGE_SIZE) | ||
504 | source $TESTDIR/utils/utils.sh | ||
505 | |||
506 | if [ ! -x "$TESTAPP_BIN" ]; then | ||
507 | - BAIL_OUT "No UST events binary detected." | ||
508 | + plan_skip_all "No UST events binary detected." | ||
509 | fi | ||
510 | |||
511 | function enable_lttng_channel_count_limit () | ||
512 | diff --git a/tests/regression/tools/tracefile-limits/test_tracefile_size b/tests/regression/tools/tracefile-limits/test_tracefile_size | ||
513 | index 3dddbe613..1089487ff 100755 | ||
514 | --- a/tests/regression/tools/tracefile-limits/test_tracefile_size | ||
515 | +++ b/tests/regression/tools/tracefile-limits/test_tracefile_size | ||
516 | @@ -33,7 +33,7 @@ NUM_TESTS=66 | ||
517 | source $TESTDIR/utils/utils.sh | ||
518 | |||
519 | if [ ! -x "$TESTAPP_BIN" ]; then | ||
520 | - BAIL_OUT "No UST events binary detected." | ||
521 | + plan_skip_all "No UST events binary detected." | ||
522 | fi | ||
523 | |||
524 | function enable_lttng_channel_size_limit () | ||
525 | diff --git a/tests/regression/tools/wildcard/test_event_wildcard b/tests/regression/tools/wildcard/test_event_wildcard | ||
526 | index 61ea67a72..921a2301d 100755 | ||
527 | --- a/tests/regression/tools/wildcard/test_event_wildcard | ||
528 | +++ b/tests/regression/tools/wildcard/test_event_wildcard | ||
529 | @@ -97,42 +97,47 @@ print_test_banner "$TEST_DESC" | ||
530 | |||
531 | start_lttng_sessiond | ||
532 | |||
533 | -diag "Test UST wildcard" | ||
534 | - | ||
535 | if [ ! -x "$TESTAPP_BIN" ]; then | ||
536 | - BAIL_OUT "No UST nevents binary detected." | ||
537 | + skip_ust=0 | ||
538 | +else | ||
539 | + skip_ust=1 | ||
540 | fi | ||
541 | |||
542 | -EVENT_NAME="tp:tptest" | ||
543 | +skip $skip_ust "No UST nevents binary detected." $NUM_UST_TESTS || | ||
544 | +{ | ||
545 | + diag "Test UST wildcard" | ||
546 | |||
547 | -# non-matching | ||
548 | -test_event_wildcard ust 0 'tp:abc*' | ||
549 | -test_event_wildcard ust 0 '*abc' | ||
550 | -test_event_wildcard ust 0 '*z*' | ||
551 | -test_event_wildcard ust 0 '*\**' | ||
552 | -test_event_wildcard ust 0 '*\*' | ||
553 | -test_event_wildcard ust 0 '\**' | ||
554 | -test_event_wildcard ust 0 '*:*tpte*s' | ||
555 | -test_event_wildcard ust 0 'tp**tpTest' | ||
556 | + EVENT_NAME="tp:tptest" | ||
557 | |||
558 | -# matching | ||
559 | -test_event_wildcard ust 1 'tp:tp*' | ||
560 | -test_event_wildcard ust 1 '*' | ||
561 | -test_event_wildcard ust 1 'tp:tptest*' | ||
562 | -test_event_wildcard ust 1 '**' | ||
563 | -test_event_wildcard ust 1 '***' | ||
564 | -test_event_wildcard ust 1 '*tptest' | ||
565 | -test_event_wildcard ust 1 '**tptest' | ||
566 | -test_event_wildcard ust 1 '*tpte*' | ||
567 | -test_event_wildcard ust 1 '*tp*' | ||
568 | -test_event_wildcard ust 1 '*tp**' | ||
569 | -test_event_wildcard ust 1 '*:*tptest' | ||
570 | -test_event_wildcard ust 1 '*:*tpte*t' | ||
571 | -test_event_wildcard ust 1 't*p*:*t*e*s*t' | ||
572 | -test_event_wildcard ust 1 '*t*p*:*t*e*s*t*' | ||
573 | -test_event_wildcard ust 1 'tp*tptest' | ||
574 | -test_event_wildcard ust 1 'tp**tptest' | ||
575 | -test_event_wildcard ust 1 'tp*test' | ||
576 | + # non-matching | ||
577 | + test_event_wildcard ust 0 'tp:abc*' | ||
578 | + test_event_wildcard ust 0 '*abc' | ||
579 | + test_event_wildcard ust 0 '*z*' | ||
580 | + test_event_wildcard ust 0 '*\**' | ||
581 | + test_event_wildcard ust 0 '*\*' | ||
582 | + test_event_wildcard ust 0 '\**' | ||
583 | + test_event_wildcard ust 0 '*:*tpte*s' | ||
584 | + test_event_wildcard ust 0 'tp**tpTest' | ||
585 | + | ||
586 | + # matching | ||
587 | + test_event_wildcard ust 1 'tp:tp*' | ||
588 | + test_event_wildcard ust 1 '*' | ||
589 | + test_event_wildcard ust 1 'tp:tptest*' | ||
590 | + test_event_wildcard ust 1 '**' | ||
591 | + test_event_wildcard ust 1 '***' | ||
592 | + test_event_wildcard ust 1 '*tptest' | ||
593 | + test_event_wildcard ust 1 '**tptest' | ||
594 | + test_event_wildcard ust 1 '*tpte*' | ||
595 | + test_event_wildcard ust 1 '*tp*' | ||
596 | + test_event_wildcard ust 1 '*tp**' | ||
597 | + test_event_wildcard ust 1 '*:*tptest' | ||
598 | + test_event_wildcard ust 1 '*:*tpte*t' | ||
599 | + test_event_wildcard ust 1 't*p*:*t*e*s*t' | ||
600 | + test_event_wildcard ust 1 '*t*p*:*t*e*s*t*' | ||
601 | + test_event_wildcard ust 1 'tp*tptest' | ||
602 | + test_event_wildcard ust 1 'tp**tptest' | ||
603 | + test_event_wildcard ust 1 'tp*test' | ||
604 | +} | ||
605 | |||
606 | if [ "$(id -u)" == "0" ]; then | ||
607 | isroot=1 | ||
608 | -- | ||
609 | 2.17.1 | ||
610 | |||