diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 22:28:33 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 22:31:28 +0300 |
commit | 193236933b0f4ab91b1625b64e2187e2db4e0e8f (patch) | |
tree | e12769d7c76d8b0517d6de3d3c72189753d253ed /poky/meta/recipes-kernel/lttng/lttng-tools/0002-Fix-test-skip-test_getcpu_override-on-single-thread-.patch | |
parent | bd93df9478f2f56ffcbc8cb88f1709c735dcd85b (diff) | |
download | openbmc-193236933b0f4ab91b1625b64e2187e2db4e0e8f.tar.xz |
reset upstream subtrees to HEAD
Reset the following subtrees on HEAD:
poky: 8217b477a1(master)
meta-xilinx: 64aa3d35ae(master)
meta-openembedded: 0435c9e193(master)
meta-raspberrypi: 490a4441ac(master)
meta-security: cb6d1c85ee(master)
Squashed patches:
meta-phosphor: drop systemd 239 patches
meta-phosphor: mrw-api: use correct install path
Change-Id: I268e2646d9174ad305630c6bbd3fbc1a6105f43d
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'poky/meta/recipes-kernel/lttng/lttng-tools/0002-Fix-test-skip-test_getcpu_override-on-single-thread-.patch')
-rw-r--r-- | poky/meta/recipes-kernel/lttng/lttng-tools/0002-Fix-test-skip-test_getcpu_override-on-single-thread-.patch | 52 |
1 files changed, 52 insertions, 0 deletions
diff --git a/poky/meta/recipes-kernel/lttng/lttng-tools/0002-Fix-test-skip-test_getcpu_override-on-single-thread-.patch b/poky/meta/recipes-kernel/lttng/lttng-tools/0002-Fix-test-skip-test_getcpu_override-on-single-thread-.patch new file mode 100644 index 0000000000..5bb88d21e5 --- /dev/null +++ b/poky/meta/recipes-kernel/lttng/lttng-tools/0002-Fix-test-skip-test_getcpu_override-on-single-thread-.patch @@ -0,0 +1,52 @@ +From e7db27668a9d7fd279d45bc43f3a2d5847374e7b Mon Sep 17 00:00:00 2001 +From: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com> +Date: Tue, 12 Mar 2019 12:04:58 -0400 +Subject: [PATCH lttng-tools 1/2] Fix: test: skip test_getcpu_override on + single thread system + +There is no value in performing this test on single thread system +since the only valid value for the cpu field is 0. + +This test currently fails on single thread system (i.e yocto runquemu) +on the test_getcpu_override_fail test case. + +Upstream-Status: Accepted [f87d0ca370c17b597762f5ee218f0e821ed2452d] +Backported to 2.11 and 2.10 + +Signed-off-by: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com> +--- + .../ust/getcpu-override/test_getcpu_override | 16 +++++++++++----- + 1 file changed, 11 insertions(+), 5 deletions(-) + +diff --git a/tests/regression/ust/getcpu-override/test_getcpu_override b/tests/regression/ust/getcpu-override/test_getcpu_override +index 4ca385aeb..ee3e31953 100755 +--- a/tests/regression/ust/getcpu-override/test_getcpu_override ++++ b/tests/regression/ust/getcpu-override/test_getcpu_override +@@ -157,13 +157,19 @@ plan_tests $NUM_TESTS + + print_test_banner "$TEST_DESC" + +-if [ -x "$CURDIR/.libs/lttng-ust-getcpu-override-test.so" ]; then +- foundobj=1 +-else +- foundobj=0 ++if [ ! -x "$CURDIR/.libs/lttng-ust-getcpu-override-test.so" ]; then ++ skip 0 "No shared object generated. Skipping all tests." $NUM_TESTS && exit 0 ++fi ++ ++if [ "$num_cpus" -eq "1" ]; then ++ # Skip the test since we cannot perform it as designed since N mod 1 ++ # is always equals to zero. There is no point testing this on a system ++ # with a single thread. LTTng-UST limits the get_cpu function to return ++ # value inside the [0, NUM_CPU - 1] range for a valid event (present in ++ # trace). ++ skip 0 "Test system only have a single thread. Skipping all tests." $NUM_TESTS && exit 0 + fi + +-skip $foundobj "No shared object generated. Skipping all tests." $NUM_TESTS && exit 0 + + TESTS=( + test_getcpu_override_fail +-- +2.17.1 + |