There's no need to copy files to the target when stap can take the short
probe directly.
Add more has-package decorators for the kernel source and GCC symlinks.
Remove the test dependencies as it's not a hard dependency.
Change the probe to print a message with some minimal logic, and verify
that the message was correctly constructed in the output.
Signed-off-by: Ross Burton <ross.bur...@arm.com>
---
meta/lib/oeqa/runtime/cases/stap.py | 35 +++++++++------------------
meta/lib/oeqa/runtime/files/hello.stp | 1 -
2 files changed, 11 insertions(+), 25 deletions(-)
delete mode 100644 meta/lib/oeqa/runtime/files/hello.stp
diff --git a/meta/lib/oeqa/runtime/cases/stap.py
b/meta/lib/oeqa/runtime/cases/stap.py
index 5342f6ac342..ac0125edb2b 100644
--- a/meta/lib/oeqa/runtime/cases/stap.py
+++ b/meta/lib/oeqa/runtime/cases/stap.py
@@ -5,33 +5,20 @@
import os
from oeqa.runtime.case import OERuntimeTestCase
-from oeqa.core.decorator.depends import OETestDepends
from oeqa.core.decorator.data import skipIfNotFeature
from oeqa.runtime.decorator.package import OEHasPackage
class StapTest(OERuntimeTestCase):
-
- @classmethod
- def setUp(cls):
- src = os.path.join(cls.tc.runtime_files_dir, 'hello.stp')
- dst = '/tmp/hello.stp'
- cls.tc.target.copyTo(src, dst)
-
- @classmethod
- def tearDown(cls):
- files = '/tmp/hello.stp'
- cls.tc.target.run('rm %s' % files)
-
- @skipIfNotFeature('tools-profile',
- 'Test requires tools-profile to be in IMAGE_FEATURES')
- @OETestDepends(['kernelmodule.KernelModuleTest.test_kernel_module'])
+ @skipIfNotFeature('tools-profile', 'Test requires tools-profile to be in
IMAGE_FEATURES')
@OEHasPackage(['systemtap'])
+ @OEHasPackage(['gcc-symlinks'])
+ @OEHasPackage(['kernel-devsrc'])
def test_stap(self):
- cmds = [
- 'cd /usr/src/kernel && make scripts prepare',
- 'cd /lib/modules/`uname -r` && (if [ ! -e build ]; then ln -s
/usr/src/kernel build; fi)',
- 'stap --disable-cache -DSTP_NO_VERREL_CHECK /tmp/hello.stp'
- ]
- for cmd in cmds:
- status, output = self.target.run(cmd, 900)
- self.assertEqual(status, 0, msg='\n'.join([cmd, output]))
+ cmd = 'make -C /usr/src/kernel scripts prepare'
+ status, output = self.target.run(cmd, 900)
+ self.assertEqual(status, 0, msg='\n'.join([cmd, output]))
+
+ cmd = 'stap -v --disable-cache -DSTP_NO_VERREL_CHECK -e \'probe
oneshot { print("Hello, "); println("world!") }\''
+ status, output = self.target.run(cmd, 900)
+ self.assertEqual(status, 0, msg='\n'.join([cmd, output]))
+ self.assertIn('Hello, world!', output, msg='\n'.join([cmd, output]))
diff --git a/meta/lib/oeqa/runtime/files/hello.stp
b/meta/lib/oeqa/runtime/files/hello.stp
deleted file mode 100644
index 36771471625..00000000000
--- a/meta/lib/oeqa/runtime/files/hello.stp
+++ /dev/null
@@ -1 +0,0 @@
-probe oneshot { println("hello world") }
--
2.25.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#160581):
https://lists.openembedded.org/g/openembedded-core/message/160581
Mute This Topic: https://lists.openembedded.org/mt/88427039/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
