From ca6c714d4a807f199db009bf4be293640623d7af Mon Sep 17 00:00:00 2001 From: Wentao Zhang Date: Mon, 18 Dec 2023 08:46:29 +0000 Subject: bpftrace: Replace python with python3 in ptest "runtime:call" in ptest gets the following FAILED: | python: No such file or directory Replace python with python3 in this ptest item. Signed-off-by: Wentao Zhang --- ...1-replace-python-with-python3-in-the-test.patch | 53 ++++++++++++++++++++++ .../recipes-devtools/bpftrace/bpftrace_0.17.0.bb | 1 + 2 files changed, 54 insertions(+) create mode 100644 dynamic-layers/openembedded-layer/recipes-devtools/bpftrace/bpftrace/0001-replace-python-with-python3-in-the-test.patch diff --git a/dynamic-layers/openembedded-layer/recipes-devtools/bpftrace/bpftrace/0001-replace-python-with-python3-in-the-test.patch b/dynamic-layers/openembedded-layer/recipes-devtools/bpftrace/bpftrace/0001-replace-python-with-python3-in-the-test.patch new file mode 100644 index 0000000..6a82a1f --- /dev/null +++ b/dynamic-layers/openembedded-layer/recipes-devtools/bpftrace/bpftrace/0001-replace-python-with-python3-in-the-test.patch @@ -0,0 +1,53 @@ +From f2a61d19d8432a220184c4eed7c39eb042d0dfff Mon Sep 17 00:00:00 2001 +From: Wentao Zhang +Date: Tue, 15 Aug 2023 11:18:36 +0800 +Subject: [PATCH] replace python with python3 in the test + +"runtime:call" in ptest gets the following FAILED: +python: No such file or directory +replace python with python3 in the test scripts. + +$export BPFTRACE_RUNTIME_TEST_EXECUTABLE=/usr/bin +$cd /usr/lib/bpftrace/ptest/tests +$python3 runtime/engine/main.py --filter="call.*" +*** +[ RUN ] call.strftime_microsecond_extension_rollover +[ FAILED ] call.strftime_microsecond_extension_rollover + Command: /usr/bin/bpftrace -e 'BEGIN { printf("%s - %s\n", strftime + ("1%f", 1000000123000), strftime("1%f", 0)); exit(); }' | tail -n + +2 | xargs -I{} python -c "print({})" + Unclean exit code: 127 + Output: __BPFTRACE_NOTIFY_PROBES_ATTACHED\nxargs: python: No such + file or directory\n +*** + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Wentao Zhang +--- + tests/runtime/call | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tests/runtime/call b/tests/runtime/call +index 36f5d9af..3a938f49 100644 +--- a/tests/runtime/call ++++ b/tests/runtime/call +@@ -294,13 +294,13 @@ TIMEOUT 5 + # + # Note we add a `1` before the timestamp b/c leading zeros (eg `0123`) is invalid integer in python. + NAME strftime_microsecond_extension +-RUN {{BPFTRACE}} -e 'BEGIN { printf("%s - %s\n", strftime("1%f", 1000123000), strftime("1%f", 0)); exit(); }' | tail -n +2 | xargs -I{} python -c "print({})" ++RUN {{BPFTRACE}} -e 'BEGIN { printf("%s - %s\n", strftime("1%f", 1000123000), strftime("1%f", 0)); exit(); }' | tail -n +2 | xargs -I{} python3 -c "print({})" + EXPECT 123 + TIMEOUT 1 + + # Similar to above test but test that rolling over past 1s works as expected + NAME strftime_microsecond_extension_rollover +-RUN {{BPFTRACE}} -e 'BEGIN { printf("%s - %s\n", strftime("1%f", 1000000123000), strftime("1%f", 0)); exit(); }' | tail -n +2 | xargs -I{} python -c "print({})" ++RUN {{BPFTRACE}} -e 'BEGIN { printf("%s - %s\n", strftime("1%f", 1000000123000), strftime("1%f", 0)); exit(); }' | tail -n +2 | xargs -I{} python3 -c "print({})" + EXPECT 123 + TIMEOUT 1 + +-- +2.25.1 + diff --git a/dynamic-layers/openembedded-layer/recipes-devtools/bpftrace/bpftrace_0.17.0.bb b/dynamic-layers/openembedded-layer/recipes-devtools/bpftrace/bpftrace_0.17.0.bb index ca97683..920896e 100644 --- a/dynamic-layers/openembedded-layer/recipes-devtools/bpftrace/bpftrace_0.17.0.bb +++ b/dynamic-layers/openembedded-layer/recipes-devtools/bpftrace/bpftrace_0.17.0.bb @@ -17,6 +17,7 @@ PV .= "+git${SRCREV}" RDEPENDS:${PN} += "bash python3 xz" SRC_URI = "git://github.com/iovisor/bpftrace;branch=master;protocol=https \ + file://0001-replace-python-with-python3-in-the-test.patch \ file://run-ptest \ " SRCREV = "1326f040a0f88287ccbc8c18fe8956bca4cc225d" -- cgit v1.2.3-54-g00ecf