From d647e02b72c69332ecea4f92a42d9a9136756451 Mon Sep 17 00:00:00 2001 From: Jonathan Lebon Date: Thu, 10 Jul 2014 17:08:23 -0400 Subject: [PATCH] modules_out_of_tree.exp: adapt for RHEL5 We put the opening braces on the same line as the function declaration so that the reported lineno in listing mode is the same on RHEL5 GCC (which considered the opening brace as the decl_line). We also skip the probing part by checking for module refresh support by using the new module_refresh_p proc. --- testsuite/systemtap.base/modules_out_of_tree.exp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/testsuite/systemtap.base/modules_out_of_tree.exp b/testsuite/systemtap.base/modules_out_of_tree.exp index 64f577c26..d8d134bff 100644 --- a/testsuite/systemtap.base/modules_out_of_tree.exp +++ b/testsuite/systemtap.base/modules_out_of_tree.exp @@ -31,13 +31,11 @@ write_to_file "stap_$test.c" { MODULE_LICENSE("GPL"); - static int __init stap_TEST_init(void) - { + static int __init stap_TEST_init(void) { return 0; } - static void __exit stap_TEST_cleanup(void) - { + static void __exit stap_TEST_cleanup(void) { return; } @@ -79,7 +77,7 @@ if {[catch {exec stap -l $pp} out] || ![regexp $reg $out]} { # OK now let's actually go for a run set subtest "probing" -if {![installtest_p] || !$am_root} { +if {![installtest_p] || !$am_root || ![module_refresh_p]} { untested "$test ($subtest)" test_cleanup return -- 2.43.5