From 6b4cbed9de98b0988692f7855871034cb5f2bb3f Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Sat, 8 Feb 2014 22:50:54 -0500 Subject: Makefile.am: updates for automake 1.14.1 Tested with automake 1:1.14.1-2 on Debian GNU/kFreeBSD --- Makefile.am | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index 8a9c952..9fb61cd 100644 --- a/Makefile.am +++ b/Makefile.am @@ -129,8 +129,8 @@ RB_LOG_FLAGS = -w PERL_TESTS = test/mogilefs_integration.perl PERL_LOG_COMPILER = $(PROVE) PERL_LOG_FLAGS = -v -SLOWRB_LOG_COMPILER = RUBY="$(RUBY)" -AM_SLOWRB_LOG_FLAGS = top_srcdir="$(top_srcdir)" +SLOWRB_LOG_COMPILER = env RUBY=$(RUBY) top_srcdir=$(top_srcdir) $(SHELL) +AM_SLOWRB_LOG_FLAGS = -u -e include $(top_srcdir)/test/ruby.mk check_tests = test/valid-path-1 test/trywrite-1 \ test/cfg-parser-1 test/fdmap-1 test/thrpool-1 \ @@ -144,8 +144,8 @@ TESTS = $(SLOW_RB_FILES) $(RB_TESTS_FAST) $(check_tests) $(PERL_TESTS) # we need TMPDIR to work in a place where iostat(1) gives stats test_tmpdir = $(top_builddir)/tmp -$(RB_TESTS:.rb=.log):: $(bin_PROGRAMS) $(test_tmpdir)/.stamp -$(PERL_TESTS:.perl=.log):: $(bin_PROGRAMS) $(test_tmpdir)/.stamp +$(RB_TESTS:.rb=.log): $(bin_PROGRAMS) $(test_tmpdir)/.stamp +$(PERL_TESTS:.perl=.log): $(bin_PROGRAMS) $(test_tmpdir)/.stamp $(test_tmpdir)/.stamp: @mkdir -p $(test_tmpdir) && > $@ -- cgit v1.2.3-24-ge0c7