Commit d7797907 authored by Bradley C. Kuszmaul's avatar Bradley C. Kuszmaul Committed by Yoni Fogel

Much, maybe all, of the output about processes being killed, is suppressed. Fixes #2287, [t:2287]

git-svn-id: file:///svn/toku/tokudb@16845 c7de825b-a66e-492c-adef-691d508d4ae1
parent 2df22206
...@@ -483,6 +483,9 @@ test1426.tdbrun: test1426.tdb$(BINSUF) dump.bdb.1426 $(PTHREAD_LOCAL) ...@@ -483,6 +483,9 @@ test1426.tdbrun: test1426.tdb$(BINSUF) dump.bdb.1426 $(PTHREAD_LOCAL)
$(MAYBEINVERTER) $(SUMMARIZE_CMD) $(MAYBEINVERTER) $(SUMMARIZE_CMD)
# STRESS RUNS is number of iterations, STRESS_SIZE is operations per iteration (must not change between iterations) # STRESS RUNS is number of iterations, STRESS_SIZE is operations per iteration (must not change between iterations)
# Note the magic with the brackets is there to suppress the printout of "/bin/bash: line 11: 1234 Killed ...."
# See http://stackoverflow.com/questions/714855/bash-suppress-notice-of-forked-command-being-killed
# also we only print the date if VERBOSE is set to non-null
STRESS_RUNS=5 STRESS_RUNS=5
STRESS_SIZE=5001 STRESS_SIZE=5001
checkpoint_stress.tdbrun: SHELL=/bin/bash checkpoint_stress.tdbrun: SHELL=/bin/bash
...@@ -490,8 +493,8 @@ checkpoint_stress.tdbrun: checkpoint_stress.tdb$(BINSUF) $(PTHREAD_LOCAL) ...@@ -490,8 +493,8 @@ checkpoint_stress.tdbrun: checkpoint_stress.tdb$(BINSUF) $(PTHREAD_LOCAL)
$(VGRIND) ./$< -C -n $(STRESS_SIZE) $(VERBVERBOSE) && \ $(VGRIND) ./$< -C -n $(STRESS_SIZE) $(VERBVERBOSE) && \
($(VGRIND) ./$< -C -i 0 -n $(STRESS_SIZE) $(VERBVERBOSE) && \ ($(VGRIND) ./$< -C -i 0 -n $(STRESS_SIZE) $(VERBVERBOSE) && \
for (( i = 1; i < $(STRESS_RUNS); i++ )); do \ for (( i = 1; i < $(STRESS_RUNS); i++ )); do \
date; \ $(if $(VERBOSE),date;) \
./$< -c -i $$i -n $(STRESS_SIZE) $(VERBVERBOSE) 2> dir.checkpoint_stress.c.tdb/error.$$i ; \ { ./$< -c -i $$i -n $(STRESS_SIZE) $(VERBVERBOSE) 2> dir.checkpoint_stress.c.tdb/error.$$i ; } 2>/dev/null ; \
if [ $$? -ne $(ABORTCODE) ] ; then \ if [ $$? -ne $(ABORTCODE) ] ; then \
exit 1 ; \ exit 1 ; \
fi ; \ fi ; \
...@@ -505,8 +508,8 @@ recover_stress.tdbrun: checkpoint_stress.tdb$(BINSUF) $(PTHREAD_LOCAL) ...@@ -505,8 +508,8 @@ recover_stress.tdbrun: checkpoint_stress.tdb$(BINSUF) $(PTHREAD_LOCAL)
$(VGRIND) ./$< -C -n $(STRESS_SIZE) -l $(VERBVERBOSE) && \ $(VGRIND) ./$< -C -n $(STRESS_SIZE) -l $(VERBVERBOSE) && \
($(VGRIND) ./$< -C -i 0 -n $(STRESS_SIZE) -l $(VERBVERBOSE) && \ ($(VGRIND) ./$< -C -i 0 -n $(STRESS_SIZE) -l $(VERBVERBOSE) && \
for (( i = 1; i < $(STRESS_RUNS); i++ )); do \ for (( i = 1; i < $(STRESS_RUNS); i++ )); do \
date; \ $(if $(VERBOSE),date;) \
./$< -c -i $$i -n $(STRESS_SIZE) -l $(VERBVERBOSE) 2> dir.checkpoint_stress.c.tdb/error.$$i ; \ { ./$< -c -i $$i -n $(STRESS_SIZE) -l $(VERBVERBOSE) 2> dir.checkpoint_stress.c.tdb/error.$$i ; } 2>/dev/null ; \
if [ $$? -ne $(ABORTCODE) ] ; then \ if [ $$? -ne $(ABORTCODE) ] ; then \
exit 1 ; \ exit 1 ; \
fi ; \ fi ; \
...@@ -557,7 +560,7 @@ recovery_fileops_unit.tdbrun: recovery_fileops_unit.tdb$(BINSUF) $(PTHREAD_LOCAL ...@@ -557,7 +560,7 @@ recovery_fileops_unit.tdbrun: recovery_fileops_unit.tdb$(BINSUF) $(PTHREAD_LOCAL
for i in $$iset; do \ for i in $$iset; do \
errorfile=dir.$@.errors/crash.$$O.$$a.$$b.$$c.$$d.$$e.$$f.$$g.$$h.$$i; \ errorfile=dir.$@.errors/crash.$$O.$$a.$$b.$$c.$$d.$$e.$$f.$$g.$$h.$$i; \
combination="-O $$O -A $$a -B $$b -C $$c -D $$d -E $$e -F $$f -G $$g -H $$h -I $$i"; \ combination="-O $$O -A $$a -B $$b -C $$c -D $$d -E $$e -F $$f -G $$g -H $$h -I $$i"; \
./$< $(VERBVERBOSE) -c $$combination 2> $$errorfile ; \ { ./$< $(VERBVERBOSE) -c $$combination 2> $$errorfile ; } 2>/dev/null ;\
if [ $$? -ne $(ABORTCODE) ] ; then \ if [ $$? -ne $(ABORTCODE) ] ; then \
{ cat dir.$@.errors/crash; echo Error: no crash in $$errorfile ; exit 1; }; \ { cat dir.$@.errors/crash; echo Error: no crash in $$errorfile ; exit 1; }; \
fi ; \ fi ; \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment