diff options
-rw-r--r-- | testsuite/ChangeLog | 7 | ||||
-rw-r--r-- | testsuite/systemtap.base/cache.exp | 2 | ||||
-rw-r--r-- | testsuite/systemtap.samples/args.exp | 12 |
3 files changed, 20 insertions, 1 deletions
diff --git a/testsuite/ChangeLog b/testsuite/ChangeLog index 37efe294..82aafd35 100644 --- a/testsuite/ChangeLog +++ b/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2007-07-26 David Smith <dsmith@redhat.com> + + PR 4295 + * systemtap.samples/args.exp: Tests to make sure the '-m' option + leaves a module in the current directory. + * systemtap.base/cache.exp (stap_compile): Added cleanup. + 2007-07-25 Mike Mason <mmlnx@us.ibm.com> PR 4836 diff --git a/testsuite/systemtap.base/cache.exp b/testsuite/systemtap.base/cache.exp index c8084ec9..eaa5ca82 100644 --- a/testsuite/systemtap.base/cache.exp +++ b/testsuite/systemtap.base/cache.exp @@ -117,7 +117,9 @@ set env(SYSTEMTAP_DIR) $local_systemtap_dir # Disable the cache with '-m' stap_compile MODNAM1 [F_UNCACHED_COMPILE] $basic_script1 -m modnam +exec /bin/rm -f modnam.ko stap_compile MODNAM2 [F_UNCACHED_COMPILE] $basic_script1 -m modnam +exec /bin/rm -f modnam.ko # Make sure scripts that don't actually compile don't get cached stap_compile ERROR1 [F_UNCACHED_NO_COMPILE] $error_script diff --git a/testsuite/systemtap.samples/args.exp b/testsuite/systemtap.samples/args.exp index 394ca9ed..e7c886c5 100644 --- a/testsuite/systemtap.samples/args.exp +++ b/testsuite/systemtap.samples/args.exp @@ -22,6 +22,16 @@ expect { eof { } } catch {close}; wait + +set modpath_cwd "$modname.ko" +if [file exists $modpath_cwd] { + pass "$test search for probe module ($modpath_cwd)" +} else { + fail "$test search for probe module ($modpath_cwd)" + return +} +exec /bin/rm -f $modpath_cwd + if [file exists $tmpdir] { pass "$test search for tmpdir ($tmpdir)" } else { @@ -33,7 +43,7 @@ set modpath "$tmpdir/$modname.ko" if [file exists $modpath] { pass "$test search for probe module ($modpath)" } else { - fail "$test search for probe module" + fail "$test search for probe module ($modpath)" return } |