summaryrefslogtreecommitdiffstats
path: root/testsuite/systemtap.base
diff options
context:
space:
mode:
authorFrank Ch. Eigler <fche@elastic.org>2009-02-17 14:19:53 -0500
committerFrank Ch. Eigler <fche@elastic.org>2009-02-17 14:19:53 -0500
commitc14341d2b7f06e6e95bb24cd4cad28ea1862dc16 (patch)
treea4a2b700925af25a135e2cf20c4cd4fbfefa7518 /testsuite/systemtap.base
parent9ffbc7987ba640144382eb8714e79192a277006a (diff)
downloadsystemtap-steved-c14341d2b7f06e6e95bb24cd4cad28ea1862dc16.tar.gz
systemtap-steved-c14341d2b7f06e6e95bb24cd4cad28ea1862dc16.tar.xz
systemtap-steved-c14341d2b7f06e6e95bb24cd4cad28ea1862dc16.zip
fix sdt.h test case for $srcdir != $builddir
Diffstat (limited to 'testsuite/systemtap.base')
-rw-r--r--testsuite/systemtap.base/static_uprobes.exp15
1 files changed, 13 insertions, 2 deletions
diff --git a/testsuite/systemtap.base/static_uprobes.exp b/testsuite/systemtap.base/static_uprobes.exp
index 95a36384..6c0f83a8 100644
--- a/testsuite/systemtap.base/static_uprobes.exp
+++ b/testsuite/systemtap.base/static_uprobes.exp
@@ -79,7 +79,12 @@ provider static_uprobes {
};
"
close $fp
-exec $env(SYSTEMTAP_PATH)/dtrace -h -s $sup_dpath
+if {[installtest_p]} {
+ set dtrace $env(SYSTEMTAP_PATH)/dtrace
+} else {
+ set dtrace $srcdir/../dtrace
+}
+exec $dtrace -h -s $sup_dpath
if {[file exists $sup_hpath]} then {
pass "generating $sup_hpath"
} else {
@@ -90,7 +95,13 @@ if {[file exists $sup_hpath]} then {
catch {exec rm -f $sup_dpath}
-set sup_flags "additional_flags=-I$env(SYSTEMTAP_INCLUDES) additional_flags=-g additional_flags=-O additional_flags=-I."
+if {[installtest_p]} {
+ set sdtdir $env(SYSTEMTAP_INCLUDES)
+} else {
+ set sdtdir $srcdir/../includes
+}
+
+set sup_flags "additional_flags=-I$sdtdir additional_flags=-g additional_flags=-O additional_flags=-I."
set res [target_compile $sup_srcpath $sup_exepath executable $sup_flags]
if { $res != "" } {
verbose "target_compile failed: $res" 2