5 files changed, 34 insertions, 19 deletions
diff --git a/testsuite/systemtap.apps/postgres.exp b/testsuite/systemtap.apps/postgres.exp
index 9d3c18c3..34d903e1 100644
--- a/testsuite/systemtap.apps/postgres.exp
+++ b/testsuite/systemtap.apps/postgres.exp
@@ -12,8 +12,9 @@ if {! [info exists env(SYSTEMTAP_TESTAPPS)] || (
 }
 
 ########## Create /tmp/stap-postgres.stp ########## 
-set postgresbuild "[pwd]/postgresql-8.3.6/bld"
-set postgresdir "[pwd]/postgresql-8.3.6/install/"
+set postgresrelease "8.3.9"
+set postgresbuild "[pwd]/postgresql-$postgresrelease/bld"
+set postgresdir "[pwd]/postgresql-$postgresrelease/install/"
 set pgdata "/tmp/stap-postgres"
 
 
@@ -110,26 +111,29 @@ fi
 kill \$STAPPID
 \}
 
-if \[ ! -r postgresql-8.3.6.tar.bz2 \] ; then
-wget http://wwwmaster.postgresql.org/redir/198/h/source/v8.3.6/postgresql-8.3.6.tar.bz2
+if \[ ! -r postgresql-$postgresrelease.tar.bz2 \] ; then
+wget http://wwwmaster.postgresql.org/redir/198/h/source/v${postgresrelease}/postgresql-$postgresrelease.tar.bz2
+fi
+if \[ ! -r postgresql-$postgresrelease.tar.bz2 \] ; then
+   echo FAIL: wget $postgresrelease.tar.gz
+   exit
 fi
 
 if \[ ! -d $postgresbuild/src/backend \] ; then
-tar -x -f postgresql-8.3.6.tar.bz2
+tar -x -f postgresql-${postgresrelease}.tar.bz2
 fi
 
-cd postgresql-8.3.6/
+cd postgresql-${postgresrelease}/
 mkdir bld;cd bld
 ../configure --enable-dtrace --prefix=$postgresdir
-# sed -i -e 's/ifeq (\$(PORTNAME), solaris)/ifeq (\$(enable_dtrace), yes)/' src/backend/Makefile
 sed -i -e 's/^CFLAGS = -O2.*\$/& -g -DEXPERIMENTAL_KPROBE_SDT/' src/Makefile.global
-make
-make install
-run_tests kprobe
+# make
+# make install
+# run_tests kprobe
 
 sed -i -e 's/-DEXPERIMENTAL_KPROBE_SDT//' src/Makefile.global
-(cd src/backend/utils/
- make clean)
+# (cd src/backend/utils/
+#  make clean)
 make
 make install
 run_tests uprobe
@@ -156,6 +160,6 @@ expect {
 if { $verbose == 0 } {
 catch {exec rm -rf $pgdata}
 catch {exec rm -rf $pgdata.stp $pgdata.log \
-	   $pgdata-markers.log $pgdata.sh postgresql-8.3.6.tar.bz2}
-catch {exec rm -rf postgresql-8.3.6}
+	   $pgdata-markers.log $pgdata.sh postgresql-${postgresrelease}.tar.bz2}
+catch {exec rm -rf postgresql-${postgresrelease}}
 }
diff --git a/testsuite/systemtap.apps/stap-tcl.sh b/testsuite/systemtap.apps/stap-tcl.sh
index c3a7f6b7..2a0d0548 100644
--- a/testsuite/systemtap.apps/stap-tcl.sh
+++ b/testsuite/systemtap.apps/stap-tcl.sh
@@ -11,6 +11,10 @@ mkdir -p tcl
 if [ ! -r tcl$tclrelease-src.tar.gz ] ; then
     wget http://sourceforge.net/projects/tcl/files/Tcl/$tclrelease/tcl$tclrelease-src.tar.gz/download
 fi
+if [ ! -r tcl$tclrelease-src.tar.gz ] ; then
+   echo FAIL: wget tcl$tclrelease-src.tar.gz
+   exit
+fi
 
 if [ ! -d tcl/src ] ; then
     tar -x -z -f tcl$tclrelease-src.tar.gz
diff --git a/testsuite/systemtap.apps/stap-tcl.stp b/testsuite/systemtap.apps/stap-tcl.stp
index db3e3690..628d801f 100644
--- a/testsuite/systemtap.apps/stap-tcl.stp
+++ b/testsuite/systemtap.apps/stap-tcl.stp
@@ -6,7 +6,7 @@ probe process(@1).library(@2).mark("*") {
 
 function judge(name, minvalue) {
          value = @count(counts[name])
-         printf("%s %s %d %d\n", ((value>=minvalue)?"OK":"KO"), name, value, minvalue)
+         printf("%s %s Got: %d Expected Minimum: %d\n", ((value>=minvalue)?"OK":"KO"), name, value, minvalue)
 }
 
 probe end,error {
@@ -21,7 +21,7 @@ probe end,error {
       judge("cmd__entry", 37000)
       judge("cmd__return", 37000)
       judge("cmd__result", 37000)
-      judge("cmd__args", 3700 /* not 37000? */)
+      judge("cmd__args", 37000)
       judge("cmd__info", 37000)
       judge("inst__start", 542000)
       judge("inst__done", 542000)
diff --git a/testsuite/systemtap.apps/tcl.exp b/testsuite/systemtap.apps/tcl.exp
index c95fa5e0..4c4a4342 100644
--- a/testsuite/systemtap.apps/tcl.exp
+++ b/testsuite/systemtap.apps/tcl.exp
@@ -54,6 +54,7 @@ expect {
     -timeout 1000
     -re {^OK [^\r\n]*[\r\n]} { incr ok; exp_continue }
     -re {^KO [^\r\n]*[\r\n]} { incr ko; exp_continue }
+    -re {^ERROR: Skipped[^\r\n]*[\r\n]} { incr xok; exp_continue }
     -re {^ERROR[^\r\n]*[\r\n]} { incr ko; exp_continue }
     -re {^[^\r\n]*[\r\n]} { incr lines; exp_continue }
     timeout { fail "$test (timeout)" }
@@ -66,4 +67,6 @@ if {$ok == 14 && $ko == 0} {
 } else {
     fail "$test ($ok $ko $lines)"
 }
-
+if {$xok == 1} {
+    xfail "$test (skipped probes)"
+}
diff --git a/testsuite/systemtap.apps/xulrunner.exp b/testsuite/systemtap.apps/xulrunner.exp
index 7a6b934a..2bcc6a20 100644
--- a/testsuite/systemtap.apps/xulrunner.exp
+++ b/testsuite/systemtap.apps/xulrunner.exp
@@ -81,6 +81,10 @@ fi
 if \[ ! -r xulrunner-$xulrelease.source.tar.bz2 \] ; then
 wget ftp://ftp.mozilla.org/pub/mozilla.org/xulrunner/releases/$xulrelease/source/xulrunner-$xulrelease.source.tar.bz2
 fi
+if \[ ! -r xulrunner-$xulrelease.source.tar.bz2 \] ; then
+   echo FAIL: wget xulrunner-$xulrelease.source.tar.bz2
+   exit
+fi
 
 if \[ ! -d xul/src \] ; then
 bunzip2 xulrunner-$xulrelease.source.tar.bz2
@@ -104,9 +108,9 @@ CFLAGS='-g -I$env(SYSTEMTAP_INCLUDES)' \
 PATH=$env(SYSTEMTAP_PATH)/:\$PATH \
 ../src/configure --prefix=$xuldir --enable-dtrace --enable-application=xulrunner
 sed -i '/include.*rules.mk/a\
-PROGOBJS+=./mozjs-dtrace.o' xul/bld/js/src/Makefile
+PROGOBJS+=mozjs-dtrace.o' js/src/Makefile
 J=\$(getconf _NPROCESSORS_CONF)
-make -j \$J
+make
 fi
 
 run_tests uprobe