PR11296: switch to "sys/sdt.h" in test cases

14 files changed, 18 insertions, 18 deletions

diff --git a/testsuite/systemtap.base/const_value.c b/testsuite/systemtap.base/const_value.c
index 2ed0f5c4..5d83a529 100644
--- a/testsuite/systemtap.base/const_value.c
+++ b/testsuite/systemtap.base/const_value.c
@@ -1,4 +1,4 @@
-#include "sdt.h"
+#include "sys/sdt.h"
 
 struct foo
 {
diff --git a/testsuite/systemtap.base/const_value.exp b/testsuite/systemtap.base/const_value.exp
index afffebca..afe8e4b6 100644
--- a/testsuite/systemtap.base/const_value.exp
+++ b/testsuite/systemtap.base/const_value.exp
@@ -6,7 +6,7 @@ j: 21}
 set test_flags "additional_flags=-g"
 # We need -O2 to get const_value encodings in dwarf.
 set test_flags "$test_flags additional_flags=-O2"
-set test_flags "$test_flags additional_flags=-I$srcdir/../includes/sys"
+set test_flags "$test_flags additional_flags=-I$srcdir/../includes"
 
 set res [target_compile $srcdir/$subdir/$test.c $test.exe executable "$test_flags"]
 if { $res != "" } {
@@ -41,7 +41,7 @@ set ::result_string {f: bar}
 set test_flags "additional_flags=-g"
 # We need -O2 to get const_value encodings in dwarf.
 set test_flags "$test_flags additional_flags=-O2"
-set test_flags "$test_flags additional_flags=-I$srcdir/../includes/sys"
+set test_flags "$test_flags additional_flags=-I$srcdir/../includes"
 
 set res [target_compile $srcdir/$subdir/$test.c $test.exe executable "$test_flags"]
 if { $res != "" } {
@@ -67,4 +67,4 @@ if {[installtest_p] && [uprobes_p]} {
 } else {
   untested "$test"
 }
-catch {exec rm -f $test.exe}
\ No newline at end of file
+catch {exec rm -f $test.exe}
diff --git a/testsuite/systemtap.base/const_value_func.c b/testsuite/systemtap.base/const_value_func.c
index 23f2f0bc..054f7513 100644
--- a/testsuite/systemtap.base/const_value_func.c
+++ b/testsuite/systemtap.base/const_value_func.c
@@ -1,4 +1,4 @@
-#include "sdt.h"
+#include "sys/sdt.h"
 
 static int
 bar (int i, long j)
diff --git a/testsuite/systemtap.base/cxxclass.cxx b/testsuite/systemtap.base/cxxclass.cxx
index 85f31c4e..492a97f9 100644
--- a/testsuite/systemtap.base/cxxclass.cxx
+++ b/testsuite/systemtap.base/cxxclass.cxx
@@ -1,4 +1,4 @@
-#include "sdt.h" /* Really <sys/sdt.h>, but pick current source version. */
+#include "sys/sdt.h"
 
 #include <stdio.h>
 
diff --git a/testsuite/systemtap.base/cxxclass.exp b/testsuite/systemtap.base/cxxclass.exp
index f9ce3668..c6c6c53b 100644
--- a/testsuite/systemtap.base/cxxclass.exp
+++ b/testsuite/systemtap.base/cxxclass.exp
@@ -12,7 +12,7 @@ main_exit}
 
 set test_flags "additional_flags=-g"
 set test_flags "$test_flags additional_flags=-O2"
-set test_flags "$test_flags additional_flags=-I$srcdir/../includes/sys"
+set test_flags "$test_flags additional_flags=-I$srcdir/../includes"
 set test_flags "$test_flags compiler=g++"
 
 set res [target_compile $srcdir/$subdir/$test.cxx $test.exe executable "$test_flags"]
diff --git a/testsuite/systemtap.base/sdt.c b/testsuite/systemtap.base/sdt.c
index 7c7398e5..0aa485b0 100644
--- a/testsuite/systemtap.base/sdt.c
+++ b/testsuite/systemtap.base/sdt.c
@@ -1,4 +1,4 @@
-#include "sdt.h" /* Really <sys/sdt.h>, but pick current source version. */
+#include "sys/sdt.h"
 
 static void call1(int a)
 {
diff --git a/testsuite/systemtap.base/sdt.exp b/testsuite/systemtap.base/sdt.exp
index 8a77cc06..26ed15cd 100644
--- a/testsuite/systemtap.base/sdt.exp
+++ b/testsuite/systemtap.base/sdt.exp
@@ -27,7 +27,7 @@ set testprog "sdt.c.exe.$i"
 
 # C
 set test_flags "additional_flags=-g"
-set test_flags "$test_flags additional_flags=-I$srcdir/../includes/sys"
+set test_flags "$test_flags additional_flags=-I$srcdir/../includes"
 set test_flags "$test_flags additional_flags=-Wall"
 set test_flags "$test_flags additional_flags=-Wextra"
 set test_flags "$test_flags additional_flags=-Werror $pbtype_flag"
@@ -55,7 +55,7 @@ catch {exec rm -f $testprog}
 set testprog "sdt.cxx.exe.$i"
 
 set test_flags "additional_flags=-g"
-set test_flags "$test_flags additional_flags=-I$srcdir/../includes/sys"
+set test_flags "$test_flags additional_flags=-I$srcdir/../includes"
 set test_flags "$test_flags additional_flags=-Wall"
 set test_flags "$test_flags additional_flags=-Werror"
 set test_flags "$test_flags additional_flags=-x additional_flags=c++ $pbtype_flag"
diff --git a/testsuite/systemtap.base/sdt_misc.exp b/testsuite/systemtap.base/sdt_misc.exp
index 3ba38c45..0cb50826 100644
--- a/testsuite/systemtap.base/sdt_misc.exp
+++ b/testsuite/systemtap.base/sdt_misc.exp
@@ -188,7 +188,7 @@ set pbtype_flag [lindex $pbtype_flags $i]
 set pbtype_mssg [lindex $pbtype_mssgs $i]
 set sup_exepath "[pwd]/sdt_misc-$pbtype_mssg.x"
 
-set sup_flags "additional_flags=-I$srcdir/../includes/sys"
+set sup_flags "additional_flags=-I$srcdir/../includes"
 set sup_flags "$sup_flags additional_flags=-I$sdtdir"
 set sup_flags "$sup_flags additional_flags=-g"
 set sup_flags "$sup_flags additional_flags=$sup_opath"
@@ -379,7 +379,7 @@ if {$ok == 5} {
 # 5. Test attaching to a running process with markers in a shared object
 
 if { $pbtype_mssg != "kprobe" } {
-set loop_flags "additional_flags=-I$srcdir/../includes/sys"
+set loop_flags "additional_flags=-I$srcdir/../includes"
 set loop_flags "$loop_flags additional_flags=-I$sdtdir"
 set loop_flags "$loop_flags additional_flags=-g"
 set loop_flags "$loop_flags additional_flags=-I. $pbtype_flag"
diff --git a/testsuite/systemtap.base/sdt_types.c b/testsuite/systemtap.base/sdt_types.c
index 42d2e6e9..e29a313b 100644
--- a/testsuite/systemtap.base/sdt_types.c
+++ b/testsuite/systemtap.base/sdt_types.c
@@ -1,4 +1,4 @@
-#include "sdt.h" /* Really <sys/sdt.h>, but pick current source version. */
+#include "sys/sdt.h"
 #include <stdint.h>
 #include <values.h>
 
diff --git a/testsuite/systemtap.base/vta-test.c b/testsuite/systemtap.base/vta-test.c
index 40986db9..d0f65a0a 100644
--- a/testsuite/systemtap.base/vta-test.c
+++ b/testsuite/systemtap.base/vta-test.c
@@ -1,5 +1,5 @@
 #include <stdlib.h>
-#include "sdt.h"
+#include "sys/sdt.h"
 
 void
 t1 (int i)
diff --git a/testsuite/systemtap.base/vta-test.exp b/testsuite/systemtap.base/vta-test.exp
index 23d7b4d3..d85a70b8 100644
--- a/testsuite/systemtap.base/vta-test.exp
+++ b/testsuite/systemtap.base/vta-test.exp
@@ -5,7 +5,7 @@ i: 0xdeadbeef87654321}
 
 set test_flags "additional_flags=-g"
 set test_flags "$test_flags additional_flags=-O2"
-set test_flags "$test_flags additional_flags=-I$srcdir/../includes/sys"
+set test_flags "$test_flags additional_flags=-I$srcdir/../includes"
 
 set res [target_compile $srcdir/$subdir/$test.c $test.exe executable "$test_flags"]
 if { $res != "" } {
diff --git a/testsuite/systemtap.exelib/exelib.exp b/testsuite/systemtap.exelib/exelib.exp
index 1337d545..14914570 100644
--- a/testsuite/systemtap.exelib/exelib.exp
+++ b/testsuite/systemtap.exelib/exelib.exp
@@ -80,7 +80,7 @@ foreach arch $arches {
 		    
 		    # General compiler flags
 		    # We want the sdt.h from the source dir.
-		    set testflags "additional_flags=-I$srcdir/../includes/sys"
+		    set testflags "additional_flags=-I$srcdir/../includes"
 		    # For now we always require debuginfo
 		    set testflags "$testflags additional_flags=-g"
 		    if {$arch != "default"} {
diff --git a/testsuite/systemtap.exelib/uprobes_exe.c b/testsuite/systemtap.exelib/uprobes_exe.c
index da65efa7..6aac2bf5 100644
--- a/testsuite/systemtap.exelib/uprobes_exe.c
+++ b/testsuite/systemtap.exelib/uprobes_exe.c
@@ -7,7 +7,7 @@
  * later version.
  */
 
-#include "sdt.h" /* Really <sys/sdt.h>, but pick current source version. */
+#include "sys/sdt.h"
 
 // function from our library
 int lib_main (void);
diff --git a/testsuite/systemtap.exelib/uprobes_lib.c b/testsuite/systemtap.exelib/uprobes_lib.c
index e3416d17..79213025 100644
--- a/testsuite/systemtap.exelib/uprobes_lib.c
+++ b/testsuite/systemtap.exelib/uprobes_lib.c
@@ -7,7 +7,7 @@
  * later version.
  */
 
-#include "sdt.h" /* Really <sys/sdt.h>, but pick current source version. */
+#include "sys/sdt.h"
 
 // volatile static variable to prevent folding of lib_func
 static volatile int foo;