diff options
| -rw-r--r-- | testsuite/ChangeLog | 4 | ||||
| -rw-r--r-- | testsuite/systemtap.base/static_uprobes.exp | 15 |
2 files changed, 17 insertions, 2 deletions
diff --git a/testsuite/ChangeLog b/testsuite/ChangeLog index 250c9b00..1c3693c0 100644 --- a/testsuite/ChangeLog +++ b/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2009-02-17 Frank Ch. Eigler <fche@elastic.org> + + * systemtap.base/static_uprobes.exp: Handle $srcdir != $builddir. + 2009-02-17 Mark Wielaard <mjw@redhat.com> * Makefile.am: Set SYSTEMTAP_INCLUDES. 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 |