diff options
| author | Mark Wielaard <mwielaard@redhat.com> | 2008-05-28 16:27:02 +0200 |
|---|---|---|
| committer | Mark Wielaard <mwielaard@redhat.com> | 2008-05-28 21:37:58 +0200 |
| commit | 2285f446112f64884da490fc66144b19f6cb8504 (patch) | |
| tree | fd1391592ea8196c938088cdf0d6177ee2eff5b3 | |
| parent | a90e7a969b9eabd434d206068155c3e75934f00f (diff) | |
| download | systemtap-steved-2285f446112f64884da490fc66144b19f6cb8504.tar.gz systemtap-steved-2285f446112f64884da490fc66144b19f6cb8504.tar.xz systemtap-steved-2285f446112f64884da490fc66144b19f6cb8504.zip | |
Correct redirect of stderr in testsuite. Make installcheck not depend on clean.
| -rw-r--r-- | testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | testsuite/Makefile.am | 4 | ||||
| -rw-r--r-- | testsuite/Makefile.in | 4 |
3 files changed, 9 insertions, 4 deletions
diff --git a/testsuite/ChangeLog b/testsuite/ChangeLog index 6798c370..cf4624ee 100644 --- a/testsuite/ChangeLog +++ b/testsuite/ChangeLog @@ -1,5 +1,10 @@ 2008-05-28 Mark Wielaard <mwielaard@redhat.com> + * testsuite/Makefile.am (clean-local): Correct redirect of stderr. + (installcheck): Don't depend on clean. + +2008-05-28 Mark Wielaard <mwielaard@redhat.com> + * lib/systemtap.exp (setup_systemtap_environment): Create user based cache dir. * systemtap.base/cache.exp: Likewise. diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am index fe089f50..b66bb75f 100644 --- a/testsuite/Makefile.am +++ b/testsuite/Makefile.am @@ -9,7 +9,7 @@ all-local: clean-local: -rm -f ./stap site.exp systemtap.sum systemtap.log - -rm -rf .systemtap* .cache_test* 2>&1 /dev/null + -rm -rf .systemtap* .cache_test* 2>/dev/null DEJAZILLA=@dejazilla@ @@ -20,7 +20,7 @@ check-local: if test -n "$(DEJAZILLA)"; then mail $(DEJAZILLA) < systemtap.sum; fi # but installcheck does not follow an implicit check-DEJAGNU, go figure -installcheck: clean site.exp +installcheck: site.exp -$(MAKE) $(AM_MAKEFLAGS) check-DEJAGNU RUNTESTFLAGS="$(RUNTESTFLAGS) --tool_opts install" if test -n "$(DEJAZILLA)"; then mail $(DEJAZILLA) < systemtap.sum; fi diff --git a/testsuite/Makefile.in b/testsuite/Makefile.in index cc76cada..c8b07bdc 100644 --- a/testsuite/Makefile.in +++ b/testsuite/Makefile.in @@ -459,7 +459,7 @@ all-local: clean-local: -rm -f ./stap site.exp systemtap.sum systemtap.log - -rm -rf .systemtap .cache_test 2>/dev/null + -rm -rf .systemtap* .cache_test* 2>/dev/null # 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 @@ -468,7 +468,7 @@ check-local: if test -n "$(DEJAZILLA)"; then mail $(DEJAZILLA) < systemtap.sum; fi # but installcheck does not follow an implicit check-DEJAGNU, go figure -installcheck: clean site.exp +installcheck: site.exp -$(MAKE) $(AM_MAKEFLAGS) check-DEJAGNU RUNTESTFLAGS="$(RUNTESTFLAGS) --tool_opts install" if test -n "$(DEJAZILLA)"; then mail $(DEJAZILLA) < systemtap.sum; fi # Tell versions [3.59,3.63) of GNU make to not export all variables. |