Skip to content

M
MariaDB
Commit 0438e575 authored by Vincenzo Liberatore's avatar Vincenzo Liberatore
Browse files
Options

Addresses #378 

Port Makefile to OSX. Reduce non-verbose output. Added completion echo for targets.

git-svn-id: file:///svn/tokudb@2306 c7de825b-a66e-492c-adef-691d508d4ae1
parent fe6bf029
Show whitespace changes
Inline Side-by-side
Showing with 26 additions and 22 deletions
src/tests/Makefile
View file @ 0438e575
...@@ -66,11 +66,15 @@ foo: ...@@ -66,11 +66,15 @@ foo:
.PHONY: check check.bdb check.tdb .PHONY: check check.bdb check.tdb
check: check.bdb check.tdb all.recover test_db_assoc3.tdbrun_wasbad check: check.bdb check.tdb all.recover test_db_assoc3.tdbrun_wasbad
@ echo ok @ echo ok $@
tests.bdb: make_libs $(BDB_TESTS) tests.bdb: make_libs $(BDB_TESTS)
@ echo ok $@
check.bdb: make_libs $(RUN_BDB_TESTS) check.bdb: make_libs $(RUN_BDB_TESTS)
@ echo ok $@
tests.tdb: make_libs $(TDB_TESTS) tests.tdb: make_libs $(TDB_TESTS)
@ echo ok $@
check.tdb: make_libs $(RUN_TDB_TESTS) check.tdb: make_libs $(RUN_TDB_TESTS)
@ echo ok $@
# Need these rule so that Make knows about all the file names # Need these rule so that Make knows about all the file names
.PHONY: %.bdbrun %.tdbrun %.run .PHONY: %.bdbrun %.tdbrun %.run
...@@ -171,13 +175,13 @@ libs: ...@@ -171,13 +175,13 @@ libs:
all.recover: test_log2.recover test_log3.recover test_log4.recover test_log5.recover all.recover: test_log2.recover test_log3.recover test_log4.recover test_log5.recover
%.recover: %.tdb %.recover: %.tdb
$(MAYBEATSIGN) cd ../../newbrt;make $(VERBQUIET) recover;make $(VERBQUIET) $(MAYBEATSIGN) cd ../../newbrt;make $(VERBQUIET) recover;make $(VERBQUIET)
$(MAYBEATSIGN) cd ..;make $(VERBQUIET) $(MAYBEATSIGN) $(SETTOKUENV) cd ..;make $(VERBQUIET)
$(MAYBEATSIGN) $(VGRIND) ./$< $(MAYBEATSIGN) $(SETTOKUENV) $(VGRIND) ./$<
$(MAYBEATSIGN) (cd dir.$(patsubst %.tdb,%.c.tdb,$<);pwd;cat log*| ../../../newbrt/tdb_logprint |wc -c) $(MAYBEATSIGN) $(SETTOKUENV) (cd dir.$(patsubst %.tdb,%.c.tdb,$<);pwd;cat log*| ../../../newbrt/tdb_logprint |wc -c)
$(MAYBEATSIGN) rm -rf dir.$(patsubst %.tdb,%.c.tdb,$<).recover $(MAYBEATSIGN) $(SETTOKUENV) rm -rf dir.$(patsubst %.tdb,%.c.tdb,$<).recover
$(MAYBEATSIGN) mkdir dir.$(patsubst %.tdb,%.c.tdb,$<).recover $(MAYBEATSIGN) $(SETTOKUENV) mkdir dir.$(patsubst %.tdb,%.c.tdb,$<).recover
$(MAYBEATSIGN) cd dir.$(patsubst %.tdb,%.c.tdb,$<).recover;$(VGRIND) ../../../newbrt/recover ../dir.$(patsubst %.tdb,%.c.tdb,$<) $(MAYBEATSIGN) $(SETTOKUENV) cd dir.$(patsubst %.tdb,%.c.tdb,$<).recover; $(VGRIND) ../../../newbrt/recover ../dir.$(patsubst %.tdb,%.c.tdb,$<)
$(MAYBEATSIGN) diff dir.$(patsubst %.tdb,%.c.tdb,$<) dir.$(patsubst %.tdb,%.c.tdb,$<).recover/foo.db $(MAYBEATSIGN) $(SETTOKUENV) diff dir.$(patsubst %.tdb,%.c.tdb,$<) dir.$(patsubst %.tdb,%.c.tdb,$<).recover/foo.db
make_libs: make_libs:
cd ..;make cd ..;make
...@@ -193,22 +197,22 @@ test_db_assoc3.tdb test_db_assoc3.bdb: test.h ...@@ -193,22 +197,22 @@ test_db_assoc3.tdb test_db_assoc3.bdb: test.h
# This one failed in both BDB and TokuDB, in the same way. It was a program error. Now it works # This one failed in both BDB and TokuDB, in the same way. It was a program error. Now it works
test_db_assoc3.tdbrun_wasbad: test_db_assoc3.tdb test_db_assoc3.tdbrun_wasbad: test_db_assoc3.tdb
$(MAYBEATSIGN) ./test_db_assoc3.tdb --seed=1 --count=200 $(MAYBEATSIGN) $(SETTOKUENV) ./test_db_assoc3.tdb --seed=1 --count=200
$(MAYBEATSIGN) ./test_db_assoc3.tdb --seed=1 --count=200 --more $(MAYBEATSIGN) $(SETTOKUENV) ./test_db_assoc3.tdb --seed=1 --count=200 --more
$(MAYBEATSIGN) ./test_db_assoc3.tdb --seed=1 --count=200 --more $(MAYBEATSIGN) $(SETTOKUENV) ./test_db_assoc3.tdb --seed=1 --count=200 --more
$(MAYBEATSIGN) ./test_db_assoc3.tdb --seed=1 --count=200 --more $(MAYBEATSIGN) $(SETTOKUENV) ./test_db_assoc3.tdb --seed=1 --count=200 --more
$(MAYBEATSIGN) ./test_db_assoc3.tdb --seed=1 --count=200 --more $(MAYBEATSIGN) $(SETTOKUENV) ./test_db_assoc3.tdb --seed=1 --count=200 --more
$(MAYBEATSIGN) ./test_db_assoc3.tdb --seed=1 --count=200 --more $(MAYBEATSIGN) $(SETTOKUENV) ./test_db_assoc3.tdb --seed=1 --count=200 --more
$(MAYBEATSIGN) ./test_db_assoc3.tdb --seed=1 --count=200 --more $(MAYBEATSIGN) $(SETTOKUENV) ./test_db_assoc3.tdb --seed=1 --count=200 --more
test_db_assoc3.tdbrun: test_db_assoc3.tdb test_db_assoc3.tdbrun: test_db_assoc3.tdb
$(MAYBEATSIGN) $(VGRIND) ./test_db_assoc3.tdb --seed=2 --count=100000 $(VERBVERBOSE) $(MAYBEATSIGN) $(SETTOKUENV) $(VGRIND) ./test_db_assoc3.tdb --seed=2 --count=100000 $(VERBVERBOSE)
$(MAYBEATSIGN) $(VGRIND) ./test_db_assoc3.tdb --seed=2 --count=100000 --more $(VERBVERBOSE) $(MAYBEATSIGN) $(SETTOKUENV) $(VGRIND) ./test_db_assoc3.tdb --seed=2 --count=100000 --more $(VERBVERBOSE)
# Give up on VGRIND for bdbrun # Give up on VGRIND for bdbrun
test_db_assoc3.bdbrun: test_db_assoc3.bdb test_db_assoc3.bdbrun: test_db_assoc3.bdb
$(MAYBEATSIGN) ./test_db_assoc3.bdb --seed=2 --count=100000 $(VERBVERBOSE) $(MAYBEATSIGN) $(UNSETTOKUENV) ./test_db_assoc3.bdb --seed=2 --count=100000 $(VERBVERBOSE)
$(MAYBEATSIGN) ./test_db_assoc3.bdb --seed=2 --count=100000 --more $(VERBVERBOSE) $(MAYBEATSIGN) $(UNSETTOKUENV) ./test_db_assoc3.bdb --seed=2 --count=100000 --more $(VERBVERBOSE)
dumpit: dumpit:
../../newbrt/brtdump dir.test_log5.c.tdb.recover/foo.db > dump.r && ../../newbrt/brtdump dir.test_log5.c.tdb/foo.db > dump.o && diff dump.o dump.r ../../newbrt/brtdump dir.test_log5.c.tdb.recover/foo.db > dump.r && ../../newbrt/brtdump dir.test_log5.c.tdb/foo.db > dump.o && diff dump.o dump.r
src/tests/test_dup_dup.c
View file @ 0438e575
...@@ -29,7 +29,7 @@ void db_put(DB *db, int k, int v, u_int32_t put_flags, int rexpect) { ...@@ -29,7 +29,7 @@ void db_put(DB *db, int k, int v, u_int32_t put_flags, int rexpect) {
if (r == EINVAL && put_flags == DB_NODUPDATA) { if (r == EINVAL && put_flags == DB_NODUPDATA) {
static int did_warn = 0; static int did_warn = 0;
if (!did_warn) { if (!did_warn) {
printf("%s:%d:WARNING:tokdub does not support DB_NODUPDATA yet\n", __FILE__, __LINE__); if (verbose) printf("%s:%d:WARNING:tokdub does not support DB_NODUPDATA yet\n", __FILE__, __LINE__);
did_warn=1; did_warn=1;
} }
return; return;
...@@ -46,7 +46,7 @@ int maybe_do_db_dup_warning (int r, int dup_mode) { ...@@ -46,7 +46,7 @@ int maybe_do_db_dup_warning (int r, int dup_mode) {
if (r != 0 && dup_mode == DB_DUP) { if (r != 0 && dup_mode == DB_DUP) {
if (did_warn==0) { if (did_warn==0) {
did_warn=1; did_warn=1;
printf("%s:%d:WARNING: tokudb does not support DB_DUP\n", __FILE__, __LINE__); if (verbose) printf("%s:%d:WARNING: tokudb does not support DB_DUP\n", __FILE__, __LINE__);
} }
return 1; return 1;
} }
......
src/tests/test_dup_search.c
View file @ 0438e575
...@@ -338,7 +338,7 @@ int main(int argc, const char *argv[]) { ...@@ -338,7 +338,7 @@ int main(int argc, const char *argv[]) {
/* dup search */ /* dup search */
#if USE_TDB #if USE_TDB
printf("%s:%d:WARNING:tokudb does not support DB_DUP\n", __FILE__, __LINE__); if (verbose) printf("%s:%d:WARNING:tokudb does not support DB_DUP\n", __FILE__, __LINE__);
#else #else
for (i = 1; i <= limit; i *= 2) { for (i = 1; i <= limit; i *= 2) {
test_ici_search(i, DB_DUP); test_ici_search(i, DB_DUP);
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7