Commit b6c9d1bc authored by Bradley C. Kuszmaul's avatar Bradley C. Kuszmaul

src/tests are now quiet with a verbose option: "make VERBOSE=1" or "make...

src/tests are now quiet with a verbose option:  "make VERBOSE=1" or "make VERBOSE=2".  Addresses #13.


git-svn-id: file:///svn/tokudb@729 c7de825b-a66e-492c-adef-691d508d4ae1
parent 2a9b3b3d
# On OSX do: # On OSX do:
# make OSX=OSX # make OSX=OSX
# For verbose output do
# make VERBOSE=1
# For very verbose output do
# make VERBOSE=2
ifeq ($(OSX),OSX) ifeq ($(OSX),OSX)
#Note: OSX 10.4 needs DYLD_LIBRARY_PATH. OSX 10.5 claims to support -rpath. #Note: OSX 10.4 needs DYLD_LIBRARY_PATH. OSX 10.5 claims to support -rpath.
LIBEXT=dylib LIBEXT=dylib
...@@ -21,6 +26,8 @@ BDB_CPPFLAGS = -I$(BDB)/include ...@@ -21,6 +26,8 @@ BDB_CPPFLAGS = -I$(BDB)/include
BDB_LDFLAGS = -L$(BDB)/lib BDB_LDFLAGS = -L$(BDB)/lib
endif endif
# VERBOSE=true
LIBNAME=libdb.$(LIBEXT) LIBNAME=libdb.$(LIBEXT)
CFLAGS = -Wall -Werror -O0 -g CFLAGS = -Wall -Werror -O0 -g
...@@ -37,6 +44,7 @@ RUN_TDB_TESTS = $(patsubst %.tdb,%.tdbrun,$(TDB_TESTS)) ...@@ -37,6 +44,7 @@ RUN_TDB_TESTS = $(patsubst %.tdb,%.tdbrun,$(TDB_TESTS))
RUN_BDB_TESTS = $(patsubst %.bdb,%.bdbrun,$(BDB_TESTS)) RUN_BDB_TESTS = $(patsubst %.bdb,%.bdbrun,$(BDB_TESTS))
RUN_ALL_TESTS = $(RUN_TDB_TESTS) $(RUN_BDB_TESTS) RUN_ALL_TESTS = $(RUN_TDB_TESTS) $(RUN_BDB_TESTS)
all: make_libs $(ALL_TESTS) all: make_libs $(ALL_TESTS)
foo: foo:
...@@ -56,12 +64,23 @@ $(ALL_TESTS): ...@@ -56,12 +64,23 @@ $(ALL_TESTS):
%.run: %.bdbrun %.tdbrun %.run: %.bdbrun %.tdbrun
ifeq ($(VERBOSE),2)
VERBVERBOSE=-v
endif
# The @ sign makes the make quiet. If there is an error there is enough info to tell what test failed. # The @ sign makes the make quiet. If there is an error there is enough info to tell what test failed.
%.bdbrun: %.bdb %.bdbrun: %.bdb
ifdef VERBOSE
$(UNSETTOKUENV); $(VGRIND) ./$< $(VERBVERBOSE)
else
@ $(UNSETTOKUENV); $(VGRIND) ./$< @ $(UNSETTOKUENV); $(VGRIND) ./$<
endif
%.tdbrun: %.tdb %.tdbrun: %.tdb
ifdef VERBOSE
$(SETTOKUENV); $(VGRIND) ./$< $(VERBVERBOSE)
else
@ $(SETTOKUENV); $(VGRIND) ./$< @ $(SETTOKUENV); $(VGRIND) ./$<
endif
# For a few of the tests bdb is making valgrind unhappy. # For a few of the tests bdb is making valgrind unhappy.
NO_VGRIND = \ NO_VGRIND = \
db_already_exists \ db_already_exists \
......
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