diff options
| author | Dave Brolley <brolley@redhat.com> | 2008-07-14 13:41:48 -0400 |
|---|---|---|
| committer | Dave Brolley <brolley@redhat.com> | 2008-07-14 13:41:48 -0400 |
| commit | 233614952872b4561accc79d9d7ef2c66f52dce4 (patch) | |
| tree | 72e66a76a92a485637f299c1720f9c3ea26a57a3 /testsuite/Makefile.am | |
| parent | f1743f00e6058d2dee44510f3ef165c549a6291e (diff) | |
| download | systemtap-steved-233614952872b4561accc79d9d7ef2c66f52dce4.tar.gz systemtap-steved-233614952872b4561accc79d9d7ef2c66f52dce4.tar.xz systemtap-steved-233614952872b4561accc79d9d7ef2c66f52dce4.zip | |
Enable 'make check' and 'make installcheck' using the systemtap client/server.
Diffstat (limited to 'testsuite/Makefile.am')
| -rw-r--r-- | testsuite/Makefile.am | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am index b66bb75f..5f3044cd 100644 --- a/testsuite/Makefile.am +++ b/testsuite/Makefile.am @@ -13,6 +13,8 @@ clean-local: DEJAZILLA=@dejazilla@ +TOOL_OPTS=$(EXTRA_TOOL_OPTS) + # automake's dejagnu library already runs check-DEJAGNU before check-local # That's why we need to add "execrc" to $(RUNTEST) - to ensure that this # subtarget gets run even if runtest per se exits with a failure. @@ -21,7 +23,7 @@ check-local: # but installcheck does not follow an implicit check-DEJAGNU, go figure installcheck: site.exp - -$(MAKE) $(AM_MAKEFLAGS) check-DEJAGNU RUNTESTFLAGS="$(RUNTESTFLAGS) --tool_opts install" + -$(MAKE) $(AM_MAKEFLAGS) check-DEJAGNU RUNTESTFLAGS="$(RUNTESTFLAGS) --tool_opts \'install $(TOOL_OPTS)\'" if test -n "$(DEJAZILLA)"; then mail $(DEJAZILLA) < systemtap.sum; fi SRCDIR = $(shell cd $(srcdir); pwd) @@ -40,6 +42,6 @@ LD_LIBRARY_PATH=$(DESTDIR)$(libdir)/systemtap CRASH_LIBDIR=$(DESTDIR)$(libdir)/systemtap SYSTEMTAP_PATH=$(DESTDIR)$(bindir) -RUNTESTDEFAULTFLAGS = --tool $$tool --srcdir $$srcdir +RUNTESTDEFAULTFLAGS = --tool $$tool --tool_opts \'$(TOOL_OPTS)\' --srcdir $$srcdir EXPECT = expect RUNTEST="env SYSTEMTAP_RUNTIME=$(SYSTEMTAP_RUNTIME) SYSTEMTAP_TAPSET=$(SYSTEMTAP_TAPSET) LD_LIBRARY_PATH=$(LD_LIBRARY_PATH) CRASH_LIBDIR=$(CRASH_LIBDIR) PATH=$(SYSTEMTAP_PATH):$$PATH $(srcdir)/execrc runtest" |