Use SYSTEMTAP_INCLUDES for systemtap.apps tests.

* mysql.exp: Use SYSTEM_INCLUDES.
* postgres.exp: Likewise.

diff --git a/testsuite/systemtap.apps/mysql.exp b/testsuite/systemtap.apps/mysql.exp
index d057b6ae808f0be806163b4e1696fbb861831254..3aca54cd951e5e6700859e7a485a9237e6247e2b 100644 (file)
--- a/testsuite/systemtap.apps/mysql.exp
+++ b/testsuite/systemtap.apps/mysql.exp
@@ -317,7 +317,7 @@ cd mysql/bld
 sed -i -e 's/HAVE_DTRACE_DASH_G=\"no\"/HAVE_DTRACE_DASH_G=\"yes\"/' ../src/configure
 ../src/configure --enable-dtrace --prefix=$mysqldir
 for i in \$(find . -name Makefile) ; do 
-    sed -i -e 's/^CXXFLAGS =/& -g/' \$i
+    sed -i -e 's|^CXXFLAGS =|& -g -I $env(SYSTEMTAP_INCLUDES)|' \$i
 done
 fi
 

diff --git a/testsuite/systemtap.apps/postgres.exp b/testsuite/systemtap.apps/postgres.exp
index 34d903e1ae299610eeb8d92479134313e064f29b..665111f1077a9746848052785fff9f14328ba29c 100644 (file)
--- a/testsuite/systemtap.apps/postgres.exp
+++ b/testsuite/systemtap.apps/postgres.exp
@@ -126,7 +126,7 @@ fi
 cd postgresql-${postgresrelease}/
 mkdir bld;cd bld
 ../configure --enable-dtrace --prefix=$postgresdir
-sed -i -e 's/^CFLAGS = -O2.*\$/& -g -DEXPERIMENTAL_KPROBE_SDT/' src/Makefile.global
+sed -i -e 's|^CFLAGS = -O2.*\$|& -g -DEXPERIMENTAL_KPROBE_SDT -I $env(SYSTEMTAP_INCLUDES)|' src/Makefile.global
 # make
 # make install
 # run_tests kprobe