Update systemtap.apps tests.

* (mysql.exp, postgres.exp, xulrunner.exp):  Update version,
  adjust test thresholds.

diff --git a/testsuite/systemtap.apps/mysql.exp b/testsuite/systemtap.apps/mysql.exp
index 70734196ad3500ce70baf95ecf51d1e6c0cbeb58..b4c7e0a8690f7f2d3ef93c18a61167b412a1e886 100644 (file)
--- a/testsuite/systemtap.apps/mysql.exp
+++ b/testsuite/systemtap.apps/mysql.exp
@@ -11,9 +11,9 @@ if {! [info exists env(SYSTEMTAP_TESTAPPS)] || (
     return
 }
 
-########## Create /tmp/stap-mysql.stp ########## 
+########## Create stap-mysql.stp ########## 
 set msdata "[pwd]/stap-mysql"
-set mysqlrelease "mysql-5.5.24"
+set mysqlrelease "mysql-5.6.26"
 set mysqldir "[pwd]/mysql/install/"
 set testsuite "[pwd]"
 
@@ -235,7 +235,7 @@ probe process(@1).mark(\"net__write__done\")
 "
 close $fp
 
-########## Begin /tmp/stap-mysql.sh ########## 
+########## Begin stap-mysql.sh ########## 
 set fp [open "$testsuite/stap-mysql.sh" "w"]
 puts $fp "
 ##### begin run_tests #####
@@ -274,7 +274,9 @@ OKAY=\$(grep 'All.*tests were successful' $testsuite/stap-mysql.log | wc -l)
 
 echo  ACQUIRE=\$ACQUIRE  RELEASE=\$RELEASE COMMAND=\$COMMAND  QUERY=\$QUERY RDLOCK=\$RDLOCK  SELECT=\$SELECT OKAY=\$OKAY
 # ACQUIRE=10040 RELEASE=10040 COMMAND=11265 QUERY=11167 RDLOCK=5149 SELECT=2895 OKAY=0
-if \[ \$ACQUIRE -gt 10000 -a \$RELEASE -gt 10000 -a \$COMMAND -gt 11200 -a \$QUERY -gt 11100 -a \$RDLOCK -gt 5100 -a \$SELECT -gt 2800 \] ; then
+# ACQUIRE=9055 RELEASE=9055 COMMAND=8129 QUERY=8081 RDLOCK=4913 SELECT=2155 OKAY=0
+
+if \[ \$ACQUIRE -gt 9000 -a \$RELEASE -gt 9000 -a \$COMMAND -gt 8000 -a \$QUERY -gt 8000 -a \$RDLOCK -gt 4900 -a \$SELECT -gt 2000 \] ; then
    echo PASS: mysql markers \$1
 else
    echo FAIL: mysql markers \$1
@@ -297,7 +299,7 @@ kill -9 $testsuite/stap-mysql/mysql.pid
 ##### end run_tests #####
 
 if \[ ! -r $mysqlrelease.tar.gz \] ; then
-wget -q http://downloads.mysql.com/archives/mysql-5.5/$mysqlrelease.tar.gz
+wget -q http://downloads.mysql.com/archives/mysql-5.6/$mysqlrelease.tar.gz
 
 fi
 if \[ ! -r $mysqlrelease.tar.gz \] ; then
@@ -340,10 +342,10 @@ make install
 run_tests uprobe
 
 "
-########## End /tmp/stap-mysql.sh ########## 
+########## End stap-mysql.sh ########## 
 close $fp
 
-########## /tmp/stap-mysql.sh does most of the work ########## 
+########## stap-mysql.sh does most of the work ########## 
 verbose -log Running mysql testsuite
 spawn sh stap-mysql.sh 2>&1
 expect {

diff --git a/testsuite/systemtap.apps/postgres.exp b/testsuite/systemtap.apps/postgres.exp
index 78673291ca3246eb4265a7c049ed8ef9415ef30f..b44cea3bf4d6cbb1dc411ebaee29a55c14f56ffc 100644 (file)
--- a/testsuite/systemtap.apps/postgres.exp
+++ b/testsuite/systemtap.apps/postgres.exp
@@ -11,9 +11,9 @@ if {! [info exists env(SYSTEMTAP_TESTAPPS)] || (
     return
 }
 
-########## Create /tmp/stap-postgres.stp ########## 
-set pgdata "/tmp/stap-postgres"
-set postgresrelease "9.1.2"
+########## Create stap-postgres.stp ########## 
+set pgdata "[pwd]/stap-postgres"
+set postgresrelease "9.4.5"
 set postgresdir "[pwd]/postgresql-$postgresrelease/install/"
 
 set fp [open "$pgdata.stp" "w"]
@@ -62,7 +62,7 @@ probe process(\"$postgresdir/bin/postgres\").mark(\"lwlock__release\")
 "
 close $fp
 
-########## Begin /tmp/stap-postgres.sh ########## 
+########## Begin stap-postgres.sh ########## 
 set fp [open "$pgdata.sh" "w"]
 puts $fp "
 function run_tests \{
@@ -93,7 +93,7 @@ OKAY=\$(grep 'test .*ok' $pgdata.log | wc -l)
 echo lwlock__acquire=\$ACQUIRE lwlock__release=\$RELEASE transaction__start=\$START transaction__commit=\$COMMIT test-ok=\$OKAY
 : 44873 75325 591 489 0
 
-if \[ \$ACQUIRE -gt 40000 -a \$RELEASE -gt 70000 -a \$START -gt 500 -a \$COMMIT -gt 400 \] ; then
+if \[ \$ACQUIRE -ge 0 -a \$RELEASE -gt 7300000 -a \$START -gt 17000 -a \$COMMIT -gt 14000 \] ; then
    echo PASS: postgres tests \$ACQUIRE/\$RELEASE/\$START/\$COMMIT
 else
    echo FAIL: postgres tests \$ACQUIRE/\$RELEASE/\$START/\$COMMIT
@@ -124,8 +124,8 @@ fi
 cd postgresql-${postgresrelease}/
 # postgres 9.0.4 now seems to want build done from source dir
 # mkdir bld;cd bld
-./configure --enable-dtrace --prefix=$postgresdir
-sed -i -e 's|^CFLAGS = -O2.*\$|& -g -I $env(SYSTEMTAP_INCLUDES)|' src/Makefile.global
+./configure --without-readline --enable-dtrace --prefix=$postgresdir
+sed -i -e 's|^CFLAGS = -O2.*\$|& -g -I $env(SYSTEMTAP_INCLUDES)|' -e 's|-O2|-O0|' src/Makefile.global
 if \[ \$(uname -m) = ppc64 \] ; then 
    sed -i -e 's|CFLAGS = |& -DSTAP_SDT_ARG_CONSTRAINT=nr |' src/Makefile.global
 fi
@@ -136,10 +136,10 @@ make install
 run_tests
 "
 
-########## End /tmp/stap-postgres.sh ########## 
+########## End stap-postgres.sh ########## 
 close $fp
 
-########## /tmp/stap-postgres.sh does most of the work ########## 
+########## stap-postgres.sh does most of the work ########## 
 verbose -log Running postgres testsuite
 spawn sh $pgdata.sh 2>&1
 expect {

diff --git a/testsuite/systemtap.apps/xulrunner.exp b/testsuite/systemtap.apps/xulrunner.exp
index 2277db621dcbc9588ccc123354730a869a2e76aa..e5183909ca4550a9d43294ea9c6158d171d3afdc 100644 (file)
--- a/testsuite/systemtap.apps/xulrunner.exp
+++ b/testsuite/systemtap.apps/xulrunner.exp
@@ -12,7 +12,7 @@ if {! [info exists env(SYSTEMTAP_TESTAPPS)] || (
 }
 
 ########## Create /tmp/stap-xul.stp ########## 
-set xulrelease "1.9.2rc1"
+set xulrelease "41.0.1"
 set xuldir "[pwd]/xul/"
 set testsuite "[pwd]"
 
@@ -81,16 +81,16 @@ fi
 \}
 ##### end run_tests #####
 
-if \[ ! -r xulrunner-$xulrelease.source.tar.bz2 \] ; then
-wget -q ftp://ftp.mozilla.org/pub/mozilla.org/xulrunner/releases/$xulrelease/source/xulrunner-$xulrelease.source.tar.bz2
+if \[ ! -r xulrunner-$xulrelease.source.tar.xz \] ; then
+wget -q http://ftp.mozilla.org/pub/mozilla.org/xulrunner/releases/latest/source/xulrunner-$xulrelease.source.tar.xz
 fi
-if \[ ! -r xulrunner-$xulrelease.source.tar.bz2 \] ; then
-   echo FAIL: wget xulrunner-$xulrelease.source.tar.bz2
+if \[ ! -r xulrunner-$xulrelease.source.tar.xz \] ; then
+   echo FAIL: wget xulrunner-$xulrelease.source.tar.xz
    exit
 fi
 
 if \[ ! -d xul/src \] ; then
-bunzip2 xulrunner-$xulrelease.source.tar.bz2
+unxz xulrunner-$xulrelease.source.tar.xz
 tar -x -f xulrunner-$xulrelease.source.tar
 mkdir xul
 mv mozilla-* xul/src
@@ -102,7 +102,7 @@ cd xul/bld
 JAVA=`yum info available 'java*openjdk' |& awk '/Name/ {print \$3}'`
 for P in glib-devel ORBit-devel \$JAVA ; do 
     if rpm -q \$P ; then :
-    else echo FAIL: Need to: yum install \$P
+    else echo FAIL: Need to: dnf install \$P
          exit
     fi
 done