diff options
| author | fche <fche> | 2007-03-14 15:20:45 +0000 |
|---|---|---|
| committer | fche <fche> | 2007-03-14 15:20:45 +0000 |
| commit | 5ba96b9022078048e9f916431d3b8792a9dc8615 (patch) | |
| tree | 8a9ef21f25cbb117e2473d96730a07f89e2559d2 /testsuite/Makefile.am | |
| parent | 3b6fd2ea934f1d75174e5a786701c90f32553fe8 (diff) | |
| download | systemtap-steved-5ba96b9022078048e9f916431d3b8792a9dc8615.tar.gz systemtap-steved-5ba96b9022078048e9f916431d3b8792a9dc8615.tar.xz systemtap-steved-5ba96b9022078048e9f916431d3b8792a9dc8615.zip | |
2007-03-13 Frank Ch. Eigler <fche@redhat.com>
PR 4171.
* Makefile.am (check, installcheck): Pass build-tree pointers
in environment variables.
* configure.ac: Run separate configury for testsuite/.
* configure, Makefile.in: Regenerated.
2007-03-14 Frank Ch. Eigler <fche@redhat.com>
PR 4171.
* configure.ac, configure, aclocal.m4: New files to permit
testsuite-only build tree.
* Makefile.am (RUNTEST): Arrange a crazy concoction of
environment/make variable for runtest.
* Makefile.in: Regenerated.
* */*.stp: Switch test cases from "./stap" to "stap" throughout.
* lib/systemtap.exp: Assume/trace environment variables.
(stap_run_batch): Add "#! stap"-handling hack.
Diffstat (limited to 'testsuite/Makefile.am')
| -rw-r--r-- | testsuite/Makefile.am | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am index 57a2bf21..1d37157a 100644 --- a/testsuite/Makefile.am +++ b/testsuite/Makefile.am @@ -1,20 +1,26 @@ -# Makefile.am --- automake input file for systemtap +# Makefile.am --- automake input file for systemtap testsuite ## process this file with automake to produce Makefile.in AUTOMAKE_OPTIONS = dejagnu -STAP_TESTDIR = .. - # The stap symlink is to enable "#! stap" test scripts. all-local: - @ln -sf $(STAP_TESTDIR)/stap . + @echo Run \"make check\" or \"make installcheck\". clean-local: @rm -f ./stap site.exp systemtap.sum systemtap.log @rm -rf .systemtap .cache_test -check-local: - installcheck-local: clean site.exp - echo "set prefix $(DESTDIR)$(prefix)" >> site.exp - $(MAKE) AM_RUNTESTFLAGS="--tool_opts install" STAP_TESTDIR=$(DESTDIR)$(bindir) check + $(MAKE) AM_RUNTESTFLAGS="--tool_opts install" check-DEJAGNU + +SRCDIR = $(shell cd $(srcdir); pwd) + +# These values point the test suite to the install tree, and +# are overridden by "make check" from full source/build tree +SYSTEMTAP_RUNTIME=$(DESTDIR)$(pkgdatadir)/runtime +SYSTEMTAP_TAPSET=$(DESTDIR)$(pkgdatadir)/tapset +LD_LIBRARY_PATH=$(DESTDIR)$(libdir)/systemtap +SYSTEMTAP_PATH=$(DESTDIR)$(bindir) + +RUNTEST="env SYSTEMTAP_RUNTIME=$(SYSTEMTAP_RUNTIME) SYSTEMTAP_TAPSET=$(SYSTEMTAP_TAPSET) LD_LIBRARY_PATH=$(LD_LIBRARY_PATH) PATH=$(SYSTEMTAP_PATH):$$PATH runtest" |