Have dtrace use [wd] as the default dir when -o isn't given.

* dtrace.in: Generate the output file from basename of input filename.
* dtrace.exp: Adjust the tests accordingly.

2 files changed, 5 insertions, 5 deletions

diff --git a/dtrace.in b/dtrace.in
index 008e1da1..96a10b3a 100755
--- a/dtrace.in
+++ b/dtrace.in
@@ -173,6 +173,7 @@ if (s_filename != "" and use_cpp):
 if (filename == ""):
     if (s_filename != ""):
 	(filename,ext) = os.path.splitext(s_filename)
+        filename = os.path.basename(filename)
     else:
         usage
         sys.exit(1)
diff --git a/testsuite/systemtap.base/dtrace.exp b/testsuite/systemtap.base/dtrace.exp
index 35a5acbf..f4cac5aa 100644
--- a/testsuite/systemtap.base/dtrace.exp
+++ b/testsuite/systemtap.base/dtrace.exp
@@ -100,21 +100,21 @@ exec rm -f /tmp/XXX
 
 verbose -log "$dtrace -G -s $dpath"
 exec $dtrace -G -s $dpath
-if {[file exists /tmp/dtrace/test.o]} then {
+if {[file exists test.o]} then {
     pass "dtrace -G"
 } else {
     fail "dtrace -G"
 }
-exec rm -f /tmp/dtrace/test.o
+exec rm -f test.o
 
 verbose -log "$dtrace -h -s $dpath"
 exec $dtrace -h -s $dpath
-if {[file exists /tmp/dtrace/test.h]} then {
+if {[file exists test.h]} then {
     pass "dtrace -h"
 } else {
     fail "dtrace -h"
 }
-exec rm -f /tmp/dtrace/test.o
+exec rm -f test.o
 
 set ok 0
 verbose -log "$dtrace -C -h -s $dpath -o XXX.h"
@@ -132,4 +132,3 @@ exec rm -f XXX.h
 
 exec /bin/rm -r /tmp/dtrace
 # -----------------------------------------------------------------
-