[t:3923] merging fastcheck timeout to mainline

git-svn-id: file:///svn/toku/tokudb@34806 c7de825b-a66e-492c-adef-691d508d4ae1

newbrt/tests/Makefile

@@ -167,7 +167,7 @@ check_%: % $(PTHREAD_LOCAL)
 	$(VGRIND) ./$< $(VERBVERBOSE) $(EXTRA_ARGS) $(SUMMARIZE_CMD)
 
 fastcheck_%: $(PTHREAD_LOCAL)
-	@($(MAKE) VGRIND= SUMMARIZE=0 check_$*) &>$*.fastlog ; \
+	@(perl -e 'alarm ($(FASTCHECKTIMEOUT) * 60) ; exec @ARGV' $(MAKE) VGRIND= SUMMARIZE=0 check_$*) &>$*.fastlog ; \
 		if test $$? != 0 ; then \
 			printf "%-60s FAIL\nexamine %s\n" check_$* $*.fastlog; \
 			exit 2 ; \
@@ -176,7 +176,7 @@ fastcheck_%: $(PTHREAD_LOCAL)
 			$(RM) $*.fastlog ; \
 		fi
 fastcheckonlyfail_%: $(PTHREAD_LOCAL)
-	@($(MAKE) VGRIND= SUMMARIZE=0 check_$*) &>$*.fastlog ; \
+	@(perl -e 'alarm ($(FASTCHECKTIMEOUT) * 60) ; exec @ARGV' $(MAKE) VGRIND= SUMMARIZE=0 check_$*) &>$*.fastlog ; \
 		if test $$? != 0 ; then \
 			printf "%-60s FAIL\nexamine %s\n" check_$* $*.fastlog; \
 			exit 2 ; \

src/tests/Makefile

@@ -545,7 +545,7 @@ $(patsubst %,test_log%.tdbrun,$(TLRECOVER)): ;
 
 .PHONY: %.fast %.fastonlyfail
 %.fast: $(DEPEND_COMPILE) $(DEPEND_LINK) $(LIBTDB) $(PTHREAD_LOCAL)
-	@($(MAKE) VGRIND= SUMMARIZE=0 $*) &>$*.fastlog ; \
+	@(perl -e 'alarm ($(FASTCHECKTIMEOUT) * 60) ; exec @ARGV' $(MAKE) VGRIND= SUMMARIZE=0 $*) &>$*.fastlog ; \
 		if test $$? != 0 ; then \
 			printf "%-60s FAIL\nexamine %s\n" $* $*.fastlog; \
 			exit 2 ; \
@@ -554,7 +554,7 @@ $(patsubst %,test_log%.tdbrun,$(TLRECOVER)): ;
 			$(RM) $*.fastlog ; \
 		fi
 %.fastonlyfail: $(DEPEND_COMPILE) $(DEPEND_LINK) $(LIBTDB) $(PTHREAD_LOCAL)
-	@($(MAKE) VGRIND= SUMMARIZE=0 $*) &>$*.fastlog ; \
+	@(perl -e 'alarm ($(FASTCHECKTIMEOUT) * 60) ; exec @ARGV' $(MAKE) VGRIND= SUMMARIZE=0 $*) &>$*.fastlog ; \
 		if test $$? != 0 ; then \
 			printf "%-60s FAIL\nexamine %s\n" $* $*.fastlog; \
 			exit 2 ; \

toku_include/Makefile.include

@@ -65,6 +65,10 @@ ifneq ($(PROF),)
     PROF_FLAGS = -pg
 endif
 
+ifeq ($(FASTCHECKTIMEOUT),)
+    FASTCHECKTIMEOUT = 30
+endif
+
 OPT_OPTFLAGS = -O3 -finline-functions
 DBG_OPTFLAGS = -O0