projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: tests: skip tests on static build
[lttng-tools.git]
/
tests
/
regression
/
ust
/
getcpu-override
/
test_getcpu_override
diff --git
a/tests/regression/ust/getcpu-override/test_getcpu_override
b/tests/regression/ust/getcpu-override/test_getcpu_override
index 585f3b3a0c58d8593ed720b3dc5c99a5042791f3..4ca385aeb0c5e19f58136af4c979498eb8a86963 100755
(executable)
--- a/
tests/regression/ust/getcpu-override/test_getcpu_override
+++ b/
tests/regression/ust/getcpu-override/test_getcpu_override
@@
-45,14
+45,10
@@
SEQUENCE_SEED=(
89 13 63 6 136 153 23 16 47 130 75 62
)
89 13 63 6 136 153 23 16 47 130 75 62
)
-# Equivalent to the syconf(_SC_NPROCESSORS_CONF) call.
-num_cpus=$(conf_proc_count)
-
source $TESTDIR/utils/utils.sh
source $TESTDIR/utils/utils.sh
-if [ ! -x "$CURDIR/.libs/lttng-ust-getcpu-override-test.so" ]; then
- BAIL_OUT "No shared object generated"
-fi
+# Equivalent to the syconf(_SC_NPROCESSORS_CONF) call.
+num_cpus=$(conf_proc_count)
# MUST set TESTDIR before calling those functions
# MUST set TESTDIR before calling those functions
@@
-161,6
+157,14
@@
plan_tests $NUM_TESTS
print_test_banner "$TEST_DESC"
print_test_banner "$TEST_DESC"
+if [ -x "$CURDIR/.libs/lttng-ust-getcpu-override-test.so" ]; then
+ foundobj=1
+else
+ foundobj=0
+fi
+
+skip $foundobj "No shared object generated. Skipping all tests." $NUM_TESTS && exit 0
+
TESTS=(
test_getcpu_override_fail
test_getcpu_override
TESTS=(
test_getcpu_override_fail
test_getcpu_override
This page took
0.024955 seconds
and
4
git commands to generate.