diff options
| -rw-r--r-- | testsuite/ChangeLog | 8 | ||||
| -rw-r--r-- | testsuite/Makefile.am | 5 | ||||
| -rw-r--r-- | testsuite/Makefile.in | 6 |
3 files changed, 15 insertions, 4 deletions
diff --git a/testsuite/ChangeLog b/testsuite/ChangeLog index 183998ae..63452c6c 100644 --- a/testsuite/ChangeLog +++ b/testsuite/ChangeLog @@ -1,3 +1,11 @@ +2007-02-19 David Smith <dsmith@redhat.com> + + PR 4081 + * Makefile.am: The symbolic link that the Makefile creates to stap + now points to the installed version of stap when "make + installcheck" is run. + * Makefile.in: Regenerated. + 2007-02-16 David Smith <dsmith@redhat.com> * systemtap.base/alternatives.exp: New test case. diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am index a4f9f7a7..57a2bf21 100644 --- a/testsuite/Makefile.am +++ b/testsuite/Makefile.am @@ -3,10 +3,11 @@ AUTOMAKE_OPTIONS = dejagnu +STAP_TESTDIR = .. # The stap symlink is to enable "#! stap" test scripts. all-local: - @ln -sf ../stap . + @ln -sf $(STAP_TESTDIR)/stap . clean-local: @rm -f ./stap site.exp systemtap.sum systemtap.log @@ -16,4 +17,4 @@ check-local: installcheck-local: clean site.exp echo "set prefix $(DESTDIR)$(prefix)" >> site.exp - $(MAKE) AM_RUNTESTFLAGS="--tool_opts install" check + $(MAKE) AM_RUNTESTFLAGS="--tool_opts install" STAP_TESTDIR=$(DESTDIR)$(bindir) check diff --git a/testsuite/Makefile.in b/testsuite/Makefile.in index b42ab5f9..4fb96356 100644 --- a/testsuite/Makefile.in +++ b/testsuite/Makefile.in @@ -107,6 +107,7 @@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PROCFLAGS = @PROCFLAGS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ @@ -149,6 +150,7 @@ stap_LIBS = @stap_LIBS@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ AUTOMAKE_OPTIONS = dejagnu +STAP_TESTDIR = .. all: all-am .SUFFIXES: @@ -334,7 +336,7 @@ uninstall-am: uninstall-info-am # The stap symlink is to enable "#! stap" test scripts. all-local: - @ln -sf ../stap . + @ln -sf $(STAP_TESTDIR)/stap . clean-local: @rm -f ./stap site.exp systemtap.sum systemtap.log @@ -344,7 +346,7 @@ check-local: installcheck-local: clean site.exp echo "set prefix $(DESTDIR)$(prefix)" >> site.exp - $(MAKE) AM_RUNTESTFLAGS="--tool_opts install" check + $(MAKE) AM_RUNTESTFLAGS="--tool_opts install" STAP_TESTDIR=$(DESTDIR)$(bindir) check # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: |