summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStan Cox <scox@redhat.com>2010-02-05 17:25:39 -0500
committerStan Cox <scox@redhat.com>2010-02-05 17:25:39 -0500
commit0621eba1754d670d878c1511a4d444dd9e54e33c (patch)
treed98926b3ccf2985f5dff870c8a0e6369102859a6
parent03d9fbb14c2f641e315be2419b70382bfd43f620 (diff)
downloadsystemtap-steved-0621eba1754d670d878c1511a4d444dd9e54e33c.tar.gz
systemtap-steved-0621eba1754d670d878c1511a4d444dd9e54e33c.tar.xz
systemtap-steved-0621eba1754d670d878c1511a4d444dd9e54e33c.zip
Use SYSTEMTAP_INCLUDES for systemtap.apps tests.
* mysql.exp: Use SYSTEM_INCLUDES. * postgres.exp: Likewise.
-rw-r--r--testsuite/systemtap.apps/mysql.exp2
-rw-r--r--testsuite/systemtap.apps/postgres.exp2
2 files changed, 2 insertions, 2 deletions
diff --git a/testsuite/systemtap.apps/mysql.exp b/testsuite/systemtap.apps/mysql.exp
index d057b6ae..3aca54cd 100644
--- 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 34d903e1..665111f1 100644
--- 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