From dd8f0f33867789e0f52cac4345e573b0614eed10 Mon Sep 17 00:00:00 2001 From: "Bradley C. Kuszmaul" Date: Tue, 6 May 2008 13:58:08 +0000 Subject: [PATCH] Hacking makefiles. Addresses #782. Also fixes a valgrind bug in one of the recovery tests. git-svn-id: file:///svn/tokudb@3814 c7de825b-a66e-492c-adef-691d508d4ae1 --- newbrt/recover.c | 1 + src/tests/Makefile | 1 - src/tests/Makefile.include | 11 ++-- src/tests/test.h | 2 + src/tests/test_abort1.c | 6 +-- src/tests/test_cursor_db_current.c | 2 +- src/tests/test_cursor_null.c | 4 +- src/tests/test_cursor_stickyness.c | 14 ++--- src/tests/test_db_assoc3.c | 23 +++++---- src/tests/test_db_close_no_open.c | 6 +-- src/tests/test_db_curs2.c | 26 ++++++---- src/tests/test_db_cursor.c | 23 +++++---- src/tests/test_db_dbt_appmalloc.c | 2 +- src/tests/test_db_dbt_malloc_leak.c | 4 +- src/tests/test_db_dbt_mem_behavior.c | 4 +- src/tests/test_db_donotindex.c | 2 +- src/tests/test_db_env_open_dir_priority.c | 5 +- src/tests/test_db_env_strdup_null.c | 4 +- src/tests/test_db_get_put_flags.c | 22 ++++---- src/tests/test_db_no_env.c | 4 +- src/tests/test_db_open_notexist_reopen.c | 6 +-- src/tests/test_db_remove_memleak.c | 4 +- src/tests/test_db_remove_subdb.c | 5 +- src/tests/test_db_secondary.c | 2 +- src/tests/test_db_version.c | 4 +- src/tests/test_dup_delete.c | 62 +++++++++++++---------- src/tests/test_dup_flags.c | 2 +- src/tests/test_env_create_db_create.c | 4 +- src/tests/test_error.c | 2 +- src/tests/test_log0.c | 4 +- src/tests/test_log1.c | 6 +-- src/tests/test_log1_abort.c | 6 +-- src/tests/test_log6a_abort.c | 34 ++++++------- src/tests/test_logflush.c | 2 +- src/tests/test_logmax.c | 2 +- src/tests/test_set_lk_max_locks.c | 2 +- src/tests/test_thread_insert.c | 6 +-- src/tests/test_thread_secondary.c | 2 +- src/tests/test_txn_abort5a.c | 2 +- src/tests/test_txn_abort7.c | 2 +- src/tests/test_txn_abort8.c | 2 +- src/tests/test_txn_abort9.c | 2 +- src/tests/test_txn_begin_commit.c | 2 +- src/tests/test_txn_commit8.c | 2 +- 44 files changed, 183 insertions(+), 150 deletions(-) diff --git a/newbrt/recover.c b/newbrt/recover.c index eb2429aaff3..4f3457a8d5b 100644 --- a/newbrt/recover.c +++ b/newbrt/recover.c @@ -324,6 +324,7 @@ void toku_recover_addchild (LSN lsn, FILENUM filenum, DISKOFF diskoff, u_int32_t } BNC_DISKOFF(node, childnum) = child; BNC_SUBTREE_FINGERPRINT(node, childnum) = childfingerprint; + BNC_SUBTREE_LEAFENTRY_ESTIMATE(node, childnum) = 0; //BNC_SUBTREE_LEAFENTRY_ESTIMATE(node, childnum) = 0; // This isn't right, but recovery is broken right now anyway, so just leaf it unininitalized. int r= toku_fifo_create(&BNC_BUFFER(node, childnum)); assert(r==0); BNC_NBYTESINBUF(node, childnum) = 0; diff --git a/src/tests/Makefile b/src/tests/Makefile index 1695952dd99..41af799769d 100644 --- a/src/tests/Makefile +++ b/src/tests/Makefile @@ -48,7 +48,6 @@ LIBNAME=libdb.$(LIBEXT) CFLAGS += -Wall -Werror $(OPTFLAGS) -g3 -ggdb3 $(GCOV_FLAGS) TDB_CPPFLAGS = -I../../include - SRCS = $(sort $(wildcard *.c)) TDB_TESTS = $(patsubst %.c,%.tdb,$(SRCS)) diff --git a/src/tests/Makefile.include b/src/tests/Makefile.include index bb6c9c1698b..630ebbe6ab7 100644 --- a/src/tests/Makefile.include +++ b/src/tests/Makefile.include @@ -19,23 +19,24 @@ SRC_TESTS_TDB_LOADLIBES = -L$(ROOT)lib -ltokudb -Wl,-rpath,.. -lpthread SRC_TESTS_TDB_CPPFLAGS = -I$(ROOT)include foo: - echo $(SRC_OFILES) - echo $(ROOT)lib/libtokudb.$(LIBEXT) + echo $(SRC_TESTS_RUN_ALL_TESTS) src/tests.checkdir: $(SRC_TESTS_RUN_ALL_TESTS) src/tests.builddir: $(SRC_TESTS_ALL_TESTS) $(SRC_TESTS_ALL_TESTS): $(SRC_TESTS_HERE)/test.h -.PHONY: $(SRC_TESTS_RUN_ALL_TESTS) %.bdbrun: %.bdb $(MAYBEATSIGN) $(UNSETTOKUENV) ./$< $(VERBVERBOSE) -# %.tdbrun: %.tdb $(ROOT)lib/libtokudb.$(LIBEXT) %.tdbrun: %.tdb $(MAYBEATSIGN) $(SETTOKUENV) $(VGRIND) ./$< $(VERBVERBOSE) $(MAYBEINVERTERR) %.bdb: %.c $(UNSETTOKUENV) cc -DENVDIR=\"$<.bdbdir\" $(BDB_CPPFLAGS) -DUSE_BDB -DIS_TDB=0 $(CFLAGS) $< $(BDB_LDFLAGS) -ldb -o $@ -%.tdb: %.c +%.tdb: %.c $(ROOT)lib/libtokudb.$(LIBEXT) $(SETTOKUENV) cc -DENVDIR=\"$<.tdbdir\" -DUSE_TDB -DIS_TDB=1 $(CFLAGS) $(CPPFLAGS) $(SRC_TESTS_TDB_CPPFLAGS) $(SRC_TESTS_TDB_LOADLIBES) $< -o $@ %.tdbt: %.c $(SETTOKUENV) cc -DENVDIR=\"$<.tdbdir\" -DUSE_TDB -DIS_TDB=1 $(CFLAGS) $(CPPFLAGS) $(SRC_TESTS_TDB_CPPFLAGS) $(TDB_TRACELOADLIBES) $< -o $@ + +$(SRC_TESTS_HERE)/test_logmax.tdb: CPPFLAGS += -D_BSD_SOURCE +$(SRC_TESTS_HERE)/test_thread_insert.tdb: CPPFLAGS += -D_GNU_SOURCE +$(SRC_TESTS_HERE)/test_thread_stack.tdb: CPPFLAGS += -D_GNU_SOURCE diff --git a/src/tests/test.h b/src/tests/test.h index 80a8692b9a7..e9023783cff 100644 --- a/src/tests/test.h +++ b/src/tests/test.h @@ -14,6 +14,8 @@ int verbose=0; +#define UU(x) x __attribute__((__unused__)) + #define CKERR(r) ({ if (r!=0) fprintf(stderr, "%s:%d error %d %s\n", __FILE__, __LINE__, r, db_strerror(r)); assert(r==0); }) #define CKERR2(r,r2) ({ if (r!=r2) fprintf(stderr, "%s:%d error %d %s, expected %d\n", __FILE__, __LINE__, r, db_strerror(r), r2); assert(r==r2); }) #define CKERR2s(r,r2,r3) ({ if (r!=r2 && r!=r3) fprintf(stderr, "%s:%d error %d %s, expected %d or %d\n", __FILE__, __LINE__, r, db_strerror(r), r2,r3); assert(r==r2||r==r3); }) diff --git a/src/tests/test_abort1.c b/src/tests/test_abort1.c index 4ff3983665c..372e37d74b0 100644 --- a/src/tests/test_abort1.c +++ b/src/tests/test_abort1.c @@ -11,9 +11,9 @@ #include #include -// ENVDIR is defined in the Makefile +#include "test.h" -#define CKERR(r) if (r!=0) fprintf(stderr, "%s:%d error %d %s\n", __FILE__, __LINE__, r, db_strerror(r)); assert(r==0); +// ENVDIR is defined in the Makefile void test_db_open_aborts (void) { DB_ENV *env; @@ -141,7 +141,7 @@ void test_db_put_aborts (void) { r=env->close(env, 0); assert(r==0); } -int main (int argc, char *argv[]) { +int main (int UU(argc), char UU(*argv[])) { test_db_open_aborts(); test_db_put_aborts(); return 0; diff --git a/src/tests/test_cursor_db_current.c b/src/tests/test_cursor_db_current.c index 7818e0f244b..c7c8750b222 100644 --- a/src/tests/test_cursor_db_current.c +++ b/src/tests/test_cursor_db_current.c @@ -88,7 +88,7 @@ void test_cursor_current() { r = db->close(db, 0); assert(r == 0); } -void db_get(DB *db, int k, int v, int expectr) { +void db_get(DB *db, int k, int UU(v), int expectr) { DBT key, val; int r = db->get(db, 0, dbt_init(&key, &k, sizeof k), dbt_init_malloc(&val), 0); assert(r == expectr); diff --git a/src/tests/test_cursor_null.c b/src/tests/test_cursor_null.c index 9b36863e399..967ff11793f 100644 --- a/src/tests/test_cursor_null.c +++ b/src/tests/test_cursor_null.c @@ -23,7 +23,7 @@ DB_ENV* dbenv; DBC* cursors[(int)256]; DB_TXN* null_txn = NULL; -void put(char txn, int _key, int _data) { +void put(int _key, int _data) { int r; DBT key; DBT data; @@ -162,7 +162,7 @@ void test(u_int32_t dup_flags) { if (i & 0x2) data = -1; else data = 1; setup_dbs(dup_flags); - put('a', key, data); + put(key, data); cget(DB_SET, TRUE, 'a', key, data); cget(DB_CURRENT, TRUE, 'a', key, data); close_dbs(); diff --git a/src/tests/test_cursor_stickyness.c b/src/tests/test_cursor_stickyness.c index 83bbb56f05d..2bbb347ba0e 100644 --- a/src/tests/test_cursor_stickyness.c +++ b/src/tests/test_cursor_stickyness.c @@ -52,7 +52,7 @@ void expect_db_get(DB *db, int k, int v) { free(val.data); } -int cursor_get(DBC *cursor, int *k, int *v, int op) { +int cursor_get(DBC *cursor, unsigned int *k, unsigned int *v, int op) { DBT key, val; int r = cursor->c_get(cursor, dbt_init_malloc(&key), dbt_init_malloc(&val), op); if (r == 0) { @@ -64,15 +64,15 @@ int cursor_get(DBC *cursor, int *k, int *v, int op) { return r; } -void expect_cursor_get(DBC *cursor, int k, int v) { +void expect_cursor_get(DBC *cursor, unsigned int k, unsigned int v) { DBT key, val; int r = cursor->c_get(cursor, dbt_init_malloc(&key), dbt_init_malloc(&val), DB_NEXT); assert(r == 0); assert(key.size == sizeof k); - int kk; + unsigned int kk; memcpy(&kk, key.data, key.size); assert(val.size == sizeof v); - int vv; + unsigned int vv; memcpy(&vv, val.data, val.size); if (kk != k || vv != v) printf("expect key %d got %d - %d %d\n", htonl(k), htonl(kk), htonl(v), htonl(vv)); assert(kk == k); @@ -95,11 +95,11 @@ void expect_cursor_get_both(DBC *cursor, int k, int v) { assert(r == 0); } -void expect_cursor_get_current(DBC *cursor, int k, int v) { +void expect_cursor_get_current(DBC *cursor, unsigned int k, unsigned int v) { DBT key, val; int r = cursor->c_get(cursor, dbt_init_malloc(&key), dbt_init_malloc(&val), DB_CURRENT); assert(r == 0); - int kk, vv; + unsigned int kk, vv; assert(key.size == sizeof kk); memcpy(&kk, key.data, key.size); assert(kk == k); assert(val.size == sizeof vv); memcpy(&vv, val.data, val.size); assert(vv == v); free(key.data); free(val.data); @@ -124,7 +124,7 @@ void test_cursor_sticky(int n, int dup_mode) { r = db->open(db, null_txn, fname, "main", DB_BTREE, DB_CREATE, 0666); assert(r == 0); int i; - int k, v; + unsigned int k, v; for (i=0; iname); } -void read_uchar_from_dbt (const DBT *dbt, int *off, unsigned char *uchar) { +void read_uchar_from_dbt (const DBT *dbt, unsigned int *off, unsigned char *uchar) { assert(*off < dbt->size); *uchar = ((unsigned char *)dbt->data)[(*off)++]; } -void read_uint_from_dbt (const DBT *dbt, int *off, unsigned int *uint) { +void read_uint_from_dbt (const DBT *dbt, unsigned int *off, unsigned int *uint) { unsigned char a,b,c,d; read_uchar_from_dbt(dbt, off, &a); read_uchar_from_dbt(dbt, off, &b); @@ -95,12 +95,12 @@ void read_uint_from_dbt (const DBT *dbt, int *off, unsigned int *uint) { *uint = (a<<24)+(b<<16)+(c<<8)+d; } -void read_timestamp_from_dbt (const DBT *dbt, int *off, struct timestamp *ts) { +void read_timestamp_from_dbt (const DBT *dbt, unsigned int *off, struct timestamp *ts) { read_uint_from_dbt(dbt, off, &ts->tv_sec); read_uint_from_dbt(dbt, off, &ts->tv_usec); } -void read_name_from_dbt (const DBT *dbt, int *off, struct name_key *nk) { +void read_name_from_dbt (const DBT *dbt, unsigned int *off, struct name_key *nk) { unsigned char buf[1000]; int i; for (i=0; 1; i++) { @@ -110,7 +110,7 @@ void read_name_from_dbt (const DBT *dbt, int *off, struct name_key *nk) { nk->name=(unsigned char*)(strdup((char*)buf)); } -void read_pd_from_dbt (const DBT *dbt, int *off, struct primary_data *pd) { +void read_pd_from_dbt (const DBT *dbt, unsigned int *off, struct primary_data *pd) { read_timestamp_from_dbt(dbt, off, &pd->expiretime); read_uchar_from_dbt(dbt, off, &pd->doesexpire); read_name_from_dbt(dbt, off, &pd->name); @@ -120,9 +120,9 @@ int name_offset_in_pd_dbt (void) { return 9; } -int name_callback (DB *secondary __attribute__((__unused__)), const DBT *key, const DBT *data, DBT *result) { +int name_callback (DB *UU(secondary), const DBT * UU(key), const DBT *data, DBT *result) { struct primary_data *pd = malloc(sizeof(*pd)); - int off=0; + unsigned int off=0; read_pd_from_dbt(data, &off, pd); static int buf[1000]; @@ -134,7 +134,7 @@ int name_callback (DB *secondary __attribute__((__unused__)), const DBT *key, co return 0; } -int expire_callback (DB *secondary __attribute__((__unused__)), const DBT *key, const DBT *data, DBT *result) { +int expire_callback (DB *UU(secondary), const DBT *UU(key), const DBT *data, DBT *result) { struct primary_data *d = data->data; if (d->doesexpire) { result->flags=0; @@ -463,6 +463,7 @@ void activity (void) { } +void usage (const char*) __attribute__((__noreturn__)); void usage (const char *argv1) { fprintf(stderr, "Usage:\n %s [ --DB-CREATE | --more ] [ --tod=N ] [ --seed=SEED ] [ --count=count ] \n", argv1); exit(1); @@ -487,7 +488,6 @@ int main (int argc, const char *argv[]) { const char *progname=argv[0]; int useseed; int activity_count = 100000; - int verbose=0; { struct timeval tv; @@ -512,7 +512,10 @@ int main (int argc, const char *argv[]) { } else if (strcmp(argv[0], "--more")==0) { mode = MODE_MORE; } else if (strcmp(argv[0], "-v")==0) { - verbose=1; + verbose++; + } else if (strcmp(argv[0], "-q")==0) { + verbose--; + if (verbose<0) verbose=0; } else if (maybe_parse_intarg(progname, argv[0], "--seed=", &useseed) || maybe_parse_intarg(progname, argv[0], "--count=", &activity_count)) { /* nothing */ diff --git a/src/tests/test_db_close_no_open.c b/src/tests/test_db_close_no_open.c index 4dbac1aa903..f1c051e66ef 100644 --- a/src/tests/test_db_close_no_open.c +++ b/src/tests/test_db_close_no_open.c @@ -8,14 +8,14 @@ #include #include -// ENVDIR is defined in the Makefile +#include "test.h" -#define CKERR(r) if (r!=0) fprintf(stderr, "%s:%d error %d %s\n", __FILE__, __LINE__, r, db_strerror(r)); assert(r==0); +// ENVDIR is defined in the Makefile DB_ENV *env; DB *db; -int main (int argc, char *argv[]) { +int main (int UU(argc), char UU(*argv[])) { int r; system("rm -rf " ENVDIR); r=mkdir(ENVDIR, 0777); assert(r==0); diff --git a/src/tests/test_db_curs2.c b/src/tests/test_db_curs2.c index 72a6d8d3d7e..edeb7348c78 100644 --- a/src/tests/test_db_curs2.c +++ b/src/tests/test_db_curs2.c @@ -101,12 +101,12 @@ void write_pd_to_dbt (DBT *dbt, const struct primary_data *pd) { write_name_to_dbt(dbt, &pd->name); } -void read_uchar_from_dbt (const DBT *dbt, int *off, unsigned char *uchar) { +void read_uchar_from_dbt (const DBT *dbt, unsigned int *off, unsigned char *uchar) { assert(*off < dbt->size); *uchar = ((unsigned char *)dbt->data)[(*off)++]; } -void read_uint_from_dbt (const DBT *dbt, int *off, unsigned int *uint) { +void read_uint_from_dbt (const DBT *dbt, unsigned int *off, unsigned int *uint) { unsigned char a,b,c,d; read_uchar_from_dbt(dbt, off, &a); read_uchar_from_dbt(dbt, off, &b); @@ -115,12 +115,12 @@ void read_uint_from_dbt (const DBT *dbt, int *off, unsigned int *uint) { *uint = (a<<24)+(b<<16)+(c<<8)+d; } -void read_timestamp_from_dbt (const DBT *dbt, int *off, struct timestamp *ts) { +void read_timestamp_from_dbt (const DBT *dbt, unsigned int *off, struct timestamp *ts) { read_uint_from_dbt(dbt, off, &ts->tv_sec); read_uint_from_dbt(dbt, off, &ts->tv_usec); } -void read_name_from_dbt (const DBT *dbt, int *off, struct name_key *nk) { +void read_name_from_dbt (const DBT *dbt, unsigned int *off, struct name_key *nk) { unsigned char buf[1000]; int i; for (i=0; 1; i++) { @@ -130,7 +130,7 @@ void read_name_from_dbt (const DBT *dbt, int *off, struct name_key *nk) { nk->name=(unsigned char*)(strdup((char*)buf)); } -void read_pd_from_dbt (const DBT *dbt, int *off, struct primary_data *pd) { +void read_pd_from_dbt (const DBT *dbt, unsigned int *off, struct primary_data *pd) { read_timestamp_from_dbt(dbt, off, &pd->creationtime); read_timestamp_from_dbt(dbt, off, &pd->expiretime); read_uchar_from_dbt(dbt, off, &pd->doesexpire); @@ -141,9 +141,9 @@ int name_offset_in_pd_dbt (void) { return 17; } -int name_callback (DB *secondary __attribute__((__unused__)), const DBT *key, const DBT *data, DBT *result) { +int name_callback (DB *secondary __attribute__((__unused__)), const DBT * UU(key), const DBT *data, DBT *result) { struct primary_data *pd = malloc(sizeof(*pd)); - int off=0; + unsigned int off=0; read_pd_from_dbt(data, &off, pd); static int buf[1000]; @@ -155,7 +155,7 @@ int name_callback (DB *secondary __attribute__((__unused__)), const DBT *key, co return 0; } -int expire_callback (DB *secondary __attribute__((__unused__)), const DBT *key, const DBT *data, DBT *result) { +int expire_callback (DB *UU(secondary), const DBT * UU(key), const DBT *data, DBT *result) { struct primary_data *d = data->data; if (d->doesexpire) { result->flags=0; @@ -348,7 +348,7 @@ void insert_person (void) { } void print_dbt (DBT *dbt) { - int i; + unsigned int i; for (i=0; isize; i++) { unsigned char c = ((char*)dbt->data)[i]; if (c!='\\' && isprint(c)) printf("%c", c); @@ -457,8 +457,9 @@ void activity (void) { } +void usage (const char *argv1) __attribute__((__noreturn__)); void usage (const char *argv1) { - fprintf(stderr, "Usage:\n %s [ --DB-CREATE | --more ] [-v] seed\n", argv1); + fprintf(stderr, "Usage:\n %s [ --DB-CREATE | --more ] [-v|-q] seed\n", argv1); exit(1); } @@ -489,7 +490,10 @@ int main (int argc, const char *argv[]) { } else if (strcmp(argv[0], "--more")==0) { mode = MODE_MORE; } else if (strcmp(argv[0], "-v")==0) { - verbose = 1; + verbose++; + } else if (strcmp(argv[0], "-q")==0) { + verbose--; + if (verbose<0) verbose = 0; } else { errno=0; char *endptr; diff --git a/src/tests/test_db_cursor.c b/src/tests/test_db_cursor.c index c115c419b30..ac1e5558aab 100644 --- a/src/tests/test_db_cursor.c +++ b/src/tests/test_db_cursor.c @@ -76,12 +76,12 @@ static void write_pd_to_dbt (DBT *dbt, const struct primary_data *pd) { write_name_to_dbt(dbt, &pd->name); } -static void read_uchar_from_dbt (const DBT *dbt, int *off, unsigned char *uchar) { +static void read_uchar_from_dbt (const DBT *dbt, unsigned int *off, unsigned char *uchar) { assert(*off < dbt->size); *uchar = ((unsigned char *)dbt->data)[(*off)++]; } -static void read_uint_from_dbt (const DBT *dbt, int *off, unsigned int *uint) { +static void read_uint_from_dbt (const DBT *dbt, unsigned int *off, unsigned int *uint) { unsigned char a,b,c,d; read_uchar_from_dbt(dbt, off, &a); read_uchar_from_dbt(dbt, off, &b); @@ -90,11 +90,11 @@ static void read_uint_from_dbt (const DBT *dbt, int *off, unsigned int *uint) { *uint = (a<<24)+(b<<16)+(c<<8)+d; } -static void read_timestamp_from_dbt (const DBT *dbt, int *off, timestamp *ts) { +static void read_timestamp_from_dbt (const DBT *dbt, unsigned int *off, timestamp *ts) { read_uint_from_dbt(dbt, off, ts); } -static void read_name_from_dbt (const DBT *dbt, int *off, struct name_key *nk) { +static void read_name_from_dbt (const DBT *dbt, unsigned int *off, struct name_key *nk) { unsigned char buf[1000]; int i; for (i=0; 1; i++) { @@ -104,16 +104,16 @@ static void read_name_from_dbt (const DBT *dbt, int *off, struct name_key *nk) { nk->name=(unsigned char*)(strdup((char*)buf)); } -static void read_pd_from_dbt (const DBT *dbt, int *off, struct primary_data *pd) { +static void read_pd_from_dbt (const DBT *dbt, unsigned int *off, struct primary_data *pd) { read_timestamp_from_dbt(dbt, off, &pd->creationtime); read_timestamp_from_dbt(dbt, off, &pd->expiretime); read_uchar_from_dbt(dbt, off, &pd->doesexpire); read_name_from_dbt(dbt, off, &pd->name); } -static int name_callback (DB *secondary __attribute__((__unused__)), const DBT *key, const DBT *data, DBT *result) { +static int name_callback (DB *secondary __attribute__((__unused__)), const DBT * UU(key), const DBT *data, DBT *result) { struct primary_data *pd = malloc(sizeof(*pd)); - int off=0; + unsigned int off=0; read_pd_from_dbt(data, &off, pd); static int buf[1000]; @@ -125,7 +125,7 @@ static int name_callback (DB *secondary __attribute__((__unused__)), const DBT * return 0; } -int expire_callback (DB *secondary __attribute__((__unused__)), const DBT *key, const DBT *data, DBT *result) { +int expire_callback (DB *UU(secondary), const DBT * UU(key), const DBT *data, DBT *result) { struct primary_data *d = data->data; if (d->doesexpire) { result->flags=0; @@ -307,7 +307,7 @@ static void activity (void) { static void usage (const char *argv1) { - fprintf(stderr, "Usage:\n %s [ --DB-CREATE | --more ] [-v] seed\n", argv1); + fprintf(stderr, "Usage:\n %s [ --DB-CREATE | --more ] [-v|-q] seed\n", argv1); exit(1); } @@ -330,7 +330,10 @@ int main (int argc, const char *argv[]) { if (strcmp(argv[0], "--more")==0) { mode = MODE_MORE; } else if (strcmp(argv[0], "-v")==0) { - verbose = 1; + verbose++; + } else if (strcmp(argv[0], "-q")==0) { + verbose--; + if (verbose<0) verbose = 0; } else { usage(progname); } diff --git a/src/tests/test_db_dbt_appmalloc.c b/src/tests/test_db_dbt_appmalloc.c index 002d2fdb874..551e068c4af 100644 --- a/src/tests/test_db_dbt_appmalloc.c +++ b/src/tests/test_db_dbt_appmalloc.c @@ -49,7 +49,7 @@ void my_free(void * p) { * getname -- extracts a secondary key (the last name) from a primary * key/data pair */ -int getskey(DB *secondary, const DBT *pkey, const DBT *pdata, DBT *skey) +int getskey(DB *UU(secondary), const DBT *UU(pkey), const DBT *pdata, DBT *skey) { DATA* entry; diff --git a/src/tests/test_db_dbt_malloc_leak.c b/src/tests/test_db_dbt_malloc_leak.c index a8d82242938..93ef040b33c 100644 --- a/src/tests/test_db_dbt_malloc_leak.c +++ b/src/tests/test_db_dbt_malloc_leak.c @@ -51,7 +51,7 @@ void my_free(void * p) { * getname -- extracts a secondary key (the last name) from a primary * key/data pair */ -int getskey(DB *secondary, const DBT *pkey, const DBT *pdata, DBT *skey) +int getskey(DB *UU(secondary), const DBT *UU(pkey), const DBT *pdata, DBT *skey) { DATA* entry; @@ -122,7 +122,7 @@ DBT* dbt_init_malloc_and_copy(DBT* dbt, int something) { return dbt; } -void pget_test_set_skey_pkey(DBC* dbc, u_int32_t flag, u_int32_t expect, int set_skey, int skey_set, int set_pkey, int pkey_set) { +void pget_test_set_skey_pkey(DBC* dbc, u_int32_t flag, int expect, int set_skey, int skey_set, int set_pkey, int pkey_set) { int r; DBT skey; DBT pkey; diff --git a/src/tests/test_db_dbt_mem_behavior.c b/src/tests/test_db_dbt_mem_behavior.c index e3d16676abb..623604abbc1 100644 --- a/src/tests/test_db_dbt_mem_behavior.c +++ b/src/tests/test_db_dbt_mem_behavior.c @@ -79,7 +79,7 @@ int main(int argc, const char *argv[]) { if (i) set_ulen = sizeof(DATA) / 2; else set_ulen = sizeof(DATA); - int old_ulen; + unsigned int old_ulen; int was_truncated = 0; int ulen_changed; int size_full; @@ -114,7 +114,7 @@ int main(int argc, const char *argv[]) { ulen_changed = data.ulen != old_ulen; size_full = data.size == sizeof(DATA); - int min = data.ulen < data.size ? data.ulen : data.size; + unsigned int min = data.ulen < data.size ? data.ulen : data.size; min = min < sizeof(DATA) ? min : sizeof(DATA); //assert(min == sizeof(DATA)); r = memcmp((DATA*)data.data, &fake, min); diff --git a/src/tests/test_db_donotindex.c b/src/tests/test_db_donotindex.c index 8cc2b31fbd8..832fefad804 100644 --- a/src/tests/test_db_donotindex.c +++ b/src/tests/test_db_donotindex.c @@ -30,7 +30,7 @@ DB_ENV *dbenv = 0; * getname -- extracts a secondary key (the last name) from a primary * key/data pair */ -int getskey(DB *secondary, const DBT *pkey, const DBT *pdata, DBT *skey) +int getskey(DB *UU(secondary), const DBT *UU(pkey), const DBT *pdata, DBT *skey) { /* * Since the secondary key is a simple structure member of the diff --git a/src/tests/test_db_env_open_dir_priority.c b/src/tests/test_db_env_open_dir_priority.c index 7ed15b53814..a85ccd09edb 100644 --- a/src/tests/test_db_env_open_dir_priority.c +++ b/src/tests/test_db_env_open_dir_priority.c @@ -1,6 +1,9 @@ /* -*- mode: C; c-basic-offset: 4 -*- */ #ident "Copyright (c) 2007 Tokutek Inc. All rights reserved." +// make stdlib define unsetenv() +#define _GNU_SOURCE + /* Do we open directories with same priority as BDB? i.e. with home, without home, with DB_USE_ENVIRON/etc.. */ #include #include @@ -72,7 +75,7 @@ int main() { reinit_config(set_home, set_DB_ENVIRON, set_DB_HOME); r = snprintf(db_name, sizeof(db_name), "%s/%s", db_dir, DBNAME); - assert(r < sizeof(db_name)); + assert(r < (int)sizeof(db_name)); assert(r >= 0); r = db_env_create(&env, 0); diff --git a/src/tests/test_db_env_strdup_null.c b/src/tests/test_db_env_strdup_null.c index f6c075220cc..ddae6a45eb3 100644 --- a/src/tests/test_db_env_strdup_null.c +++ b/src/tests/test_db_env_strdup_null.c @@ -8,12 +8,14 @@ #include #include +#include "test.h" + // ENVDIR is defined in the Makefile DB_ENV *env; DB *db; -int main (int argc, char *argv[]) { +int main (int UU(argc), char UU(*argv[])) { int r; r=system("rm -rf " ENVDIR); assert(r==0); r=mkdir(ENVDIR, 0777); assert(r==0); diff --git a/src/tests/test_db_get_put_flags.c b/src/tests/test_db_get_put_flags.c index f4a88b57fbb..10bb9c4c606 100644 --- a/src/tests/test_db_get_put_flags.c +++ b/src/tests/test_db_get_put_flags.c @@ -77,14 +77,14 @@ void close_secondary() { r = sdbp->close(sdbp, 0); CKERR(r); } -void insert_bad_flags(DB* dbp, u_int32_t flags, int r_expect, int keyint, int dataint) { +void insert_bad_flags(DB* db, u_int32_t flags, int r_expect, int keyint, int dataint) { DBT key; DBT data; int r; dbt_init(&key, &keyint, sizeof(keyint)); dbt_init(&data,&dataint,sizeof(dataint)); - r = dbp->put(dbp, null_txn, &key, &data, flags); + r = db->put(db, null_txn, &key, &data, flags); CKERR2(r, r_expect); } @@ -99,14 +99,14 @@ void cinsert_bad_flags(DBC* dbc, u_int32_t flags, int r_expect, int keyint, int CKERR2(r, r_expect); } -void get_bad_flags(DB* dbp, u_int32_t flags, int r_expect, int keyint, int dataint) { +void get_bad_flags(DB* db, u_int32_t flags, int r_expect, int keyint, int dataint) { DBT key; DBT data; int r; dbt_init(&key, &keyint, sizeof(keyint)); dbt_init(&data,&dataint,sizeof(dataint)); - r = dbp->get(dbp, null_txn, &key, &data, flags); + r = db->get(db, null_txn, &key, &data, flags); CKERR2(r, r_expect); //Verify things don't change. assert(*(int*)key.data == keyint); @@ -168,17 +168,17 @@ PUT_TEST put_tests[] = { const int num_put = sizeof(put_tests) / sizeof(put_tests[0]); CPUT_TEST cput_tests[] = { - {0, {{TPUT, 0, EINVAL, 0, 1}, {TGET, DB_GET_BOTH, DB_NOTFOUND, 0, 1}, {NONE, }, }}, - {DB_DUP|DB_DUPSORT, {{TPUT, 0, EINVAL, 0, 1}, {TGET, DB_GET_BOTH, DB_NOTFOUND, 0, 1}, {NONE, }, }}, + {0, {{TPUT, 0, EINVAL, 0, 1}, {TGET, DB_GET_BOTH, DB_NOTFOUND, 0, 1}, {NONE, 0, 0, 0, 0}, }}, + {DB_DUP|DB_DUPSORT, {{TPUT, 0, EINVAL, 0, 1}, {TGET, DB_GET_BOTH, DB_NOTFOUND, 0, 1}, {NONE, 0, 0, 0, 0}, }}, {0, {{TPUT, DB_KEYFIRST, 0, 0, 1}, {TGET, DB_GET_BOTH, 0, 0, 1}, {TPUT, DB_CURRENT, 0, 0, 2}, {TGET, DB_GET_BOTH, DB_NOTFOUND, 0, 1}}}, {DB_DUP|DB_DUPSORT, {{TPUT, DB_KEYFIRST, 0, 0, 1}, {TGET, DB_GET_BOTH, 0, 0, 1}, {TPUT, DB_CURRENT, EINVAL, 0, 2}, {TGET, DB_GET_BOTH, 0, 0, 1}}}, {0, {{TPUT, DB_KEYLAST, 0, 0, 1}, {TGET, DB_GET_BOTH, 0, 0, 1}, {TPUT, DB_CURRENT, 0, 0, 2}, {TGET, DB_GET_BOTH, DB_NOTFOUND, 0, 1}}}, {DB_DUP|DB_DUPSORT, {{TPUT, DB_KEYLAST, 0, 0, 1}, {TGET, DB_GET_BOTH, 0, 0, 1}, {TPUT, DB_CURRENT, EINVAL, 0, 2}, {TGET, DB_GET_BOTH, 0, 0, 1}}}, {DB_DUP|DB_DUPSORT, {{TPUT, DB_KEYLAST, 0, 0, 1}, {TGET, DB_GET_BOTH, 0, 0, 1}, {TPUT, DB_CURRENT, 0, 1, 1}, {TGET, DB_GET_BOTH, DB_NOTFOUND, 1, 1}}}, {DB_DUP|DB_DUPSORT, {{TPUT, DB_KEYLAST, 0, 0, 1}, {TGET, DB_GET_BOTH, 0, 0, 1}, {TPUT, DB_CURRENT, 0, 1, 1}, {TGET, DB_GET_BOTH, 0, 0, 1}}}, - {0, {{TPUT, DB_CURRENT, EINVAL, 0, 1}, {TGET, DB_GET_BOTH, DB_NOTFOUND, 0, 1}, {NONE, }, }}, - {DB_DUP|DB_DUPSORT, {{TPUT, DB_CURRENT, EINVAL, 0, 1}, {TGET, DB_GET_BOTH, DB_NOTFOUND, 0, 1}, {NONE, }, }}, - {0, {{TPUT, DB_NODUPDATA, EINVAL, 0, 1}, {TGET, DB_GET_BOTH, DB_NOTFOUND, 0, 1}, {NONE, }, }}, + {0, {{TPUT, DB_CURRENT, EINVAL, 0, 1}, {TGET, DB_GET_BOTH, DB_NOTFOUND, 0, 1}, {NONE, 0, 0, 0, 0}, }}, + {DB_DUP|DB_DUPSORT, {{TPUT, DB_CURRENT, EINVAL, 0, 1}, {TGET, DB_GET_BOTH, DB_NOTFOUND, 0, 1}, {NONE, 0, 0, 0, 0}, }}, + {0, {{TPUT, DB_NODUPDATA, EINVAL, 0, 1}, {TGET, DB_GET_BOTH, DB_NOTFOUND, 0, 1}, {NONE, 0, 0, 0, 0}, }}, {DB_DUP|DB_DUPSORT, {{TPUT, DB_NODUPDATA, 0, 0, 1}, {TGET, DB_GET_BOTH, 0, 0, 1}, {TPUT, DB_NODUPDATA, 0, 0, 2}, {TGET, DB_GET_BOTH, 0, 0, 1}, }}, {DB_DUP|DB_DUPSORT, {{TPUT, DB_NODUPDATA, 0, 0, 1}, {TGET, DB_GET_BOTH, 0, 0, 1}, {TPUT, DB_NODUPDATA, 0, 0, 2}, {TGET, DB_GET_BOTH, 0, 0, 2}, }}, {DB_DUP|DB_DUPSORT, {{TPUT, DB_NODUPDATA, 0, 0, 1}, {TGET, DB_GET_BOTH, 0, 0, 1}, {TPUT, DB_NODUPDATA, DB_KEYEXIST, 0, 1}, {TGET, DB_GET_BOTH, 0, 0, 1}, }}, @@ -204,11 +204,11 @@ GET_TEST get_tests[] = { const int num_get = sizeof(get_tests) / sizeof(get_tests[0]); STEST stests[] = { - {0, 0, {{SGET, DB_GET_BOTH, EINVAL, 0, 1}, {NONE, }, }}, + {0, 0, {{SGET, DB_GET_BOTH, EINVAL, 0, 1}, {NONE, 0, 0, 0, 0}, }}, }; const int num_stests = sizeof(stests) / sizeof(stests[0]); -int identity_callback(DB *secondary __attribute__((__unused__)), const DBT *key, const DBT *data, DBT *result) { +int identity_callback(DB *secondary __attribute__((__unused__)), const DBT *key, const DBT *UU(data), DBT *result) { memset(result, 0, sizeof(result)); result->size = key->size; result->data = key->data; diff --git a/src/tests/test_db_no_env.c b/src/tests/test_db_no_env.c index 64bfdd1bb12..f5259620b05 100644 --- a/src/tests/test_db_no_env.c +++ b/src/tests/test_db_no_env.c @@ -7,7 +7,9 @@ #include #include -int main (int argc, char *argv[]) { +#include "test.h" + +int main (int UU(argc), char UU(*argv[])) { DB *db; int r; r = db_create(&db, 0, 0); diff --git a/src/tests/test_db_open_notexist_reopen.c b/src/tests/test_db_open_notexist_reopen.c index 0cc156e7bcf..115b29ce9d7 100644 --- a/src/tests/test_db_open_notexist_reopen.c +++ b/src/tests/test_db_open_notexist_reopen.c @@ -8,14 +8,14 @@ #include #include +#include "test.h" + // ENVDIR is defined in the Makefile DB_ENV *env; DB *db; -#define CKERR(r) if (r!=0) fprintf(stderr, "%s:%d error %d %s\n", __FILE__, __LINE__, r, db_strerror(r)); assert(r==0); - -int main (int argc, char *argv[]) { +int main (int UU(argc), char UU(*argv[])) { int r; system("rm -rf " ENVDIR); r=mkdir(ENVDIR, 0777); assert(r==0); diff --git a/src/tests/test_db_remove_memleak.c b/src/tests/test_db_remove_memleak.c index 19386903d2c..66aa41cc017 100644 --- a/src/tests/test_db_remove_memleak.c +++ b/src/tests/test_db_remove_memleak.c @@ -9,6 +9,8 @@ #include #include +#include "test.h" + // ENVDIR is defined in the Makefile DB_ENV *env; @@ -16,7 +18,7 @@ DB *db; DBT key; DBT data; -int main (int argc, char *argv[]) { +int main (int UU(argc), char UU(*argv[])) { int r; system("rm -rf " ENVDIR); r=mkdir(ENVDIR, 0777); assert(r==0); diff --git a/src/tests/test_db_remove_subdb.c b/src/tests/test_db_remove_subdb.c index b38b4bef382..05ca94d376a 100644 --- a/src/tests/test_db_remove_subdb.c +++ b/src/tests/test_db_remove_subdb.c @@ -9,15 +9,16 @@ #include #include +#include "test.h" + // ENVDIR is defined in the Makefile -#define CKERR(r) if (r!=0) fprintf(stderr, "%s:%d error %d %s\n", __FILE__, __LINE__, r, db_strerror(r)); assert(r==0); DB_ENV *env; DB *db; DBT key; DBT data; -int main (int argc, char *argv[]) { +int main (int UU(argc), char UU(*argv[])) { int r; system("rm -rf " ENVDIR); r=mkdir(ENVDIR, 0777); assert(r==0); diff --git a/src/tests/test_db_secondary.c b/src/tests/test_db_secondary.c index aaf696ec732..4aaa255b146 100644 --- a/src/tests/test_db_secondary.c +++ b/src/tests/test_db_secondary.c @@ -32,7 +32,7 @@ DB_ENV *dbenv; * getname -- extracts a secondary key (the last name) from a primary * key/data pair */ -int getname(DB *secondary, const DBT *pkey, const DBT *pdata, DBT *skey) +int getname(DB *UU(secondary), const DBT *UU(pkey), const DBT *pdata, DBT *skey) { /* * Since the secondary key is a simple structure member of the diff --git a/src/tests/test_db_version.c b/src/tests/test_db_version.c index cb3581bc305..e8c66bc1f3e 100644 --- a/src/tests/test_db_version.c +++ b/src/tests/test_db_version.c @@ -4,7 +4,9 @@ #include #include -int main (int argc, char *argv[]) { +#include "test.h" + +int main (int UU(argc), char UU(*argv[])) { const char *v; int major, minor, patch; v = db_version(0, 0, 0); diff --git a/src/tests/test_dup_delete.c b/src/tests/test_dup_delete.c index 0fc524462f5..60f19a25e9d 100644 --- a/src/tests/test_dup_delete.c +++ b/src/tests/test_dup_delete.c @@ -90,16 +90,18 @@ void test_dup_delete(int n, int dup_mode) { DBT key, val; r = db->get(db, null_txn, dbt_init(&key, &k, sizeof k), dbt_init_malloc(&val), 0); assert(r == 0); - int vv; + unsigned int vv; assert(val.size == sizeof vv); memcpy(&vv, val.data, val.size); assert(vv == htonl(n)); free(val.data); } - DBT key; int k = htonl(n/2); - r = db->del(db, null_txn, dbt_init(&key, &k, sizeof k), 0); - assert(r == 0); + { + DBT key; int k = htonl(n/2); + r = db->del(db, null_txn, dbt_init(&key, &k, sizeof k), 0); + assert(r == 0); + } /* verify lookup fails */ { @@ -261,17 +263,19 @@ void test_dup_delete_insert(int n, int dup_mode) { DBT key, val; r = db->get(db, null_txn, dbt_init(&key, &k, sizeof k), dbt_init_malloc(&val), 0); assert(r == 0); - int vv; + unsigned int vv; assert(val.size == sizeof vv); memcpy(&vv, val.data, val.size); assert(vv == htonl(0)); free(val.data); } - int k = htonl(n/2); - DBT key; - r = db->del(db, null_txn, dbt_init(&key, &k, sizeof k), 0); - assert(r == 0); + { + int k = htonl(n/2); + DBT key; + r = db->del(db, null_txn, dbt_init(&key, &k, sizeof k), 0); + assert(r == 0); + } /* insert n duplicates */ for (i=0; iget(db, null_txn, dbt_init(&key, &k, sizeof k), dbt_init_malloc(&val), 0); assert(r == 0); - int vv; + unsigned int vv; assert(val.size == sizeof vv); memcpy(&vv, val.data, val.size); assert(vv == htonl(0)); @@ -359,9 +363,11 @@ void test_all_dup_delete_insert(int n) { db_put(db, k, v); } - DBT key; int k = htonl(n/2); - r = db->del(db, null_txn, dbt_init(&key, &k, sizeof k), 0); - assert(r == 0); + { + DBT key; int k = htonl(n/2); + r = db->del(db, null_txn, dbt_init(&key, &k, sizeof k), 0); + assert(r == 0); + } /* insert n duplicates */ for (i=0; idel(db, null_txn, dbt_init(&key, &k, sizeof k), 0); - assert(r == 0); + DBT key; int k = htonl(n/2); + r = db->del(db, null_txn, dbt_init(&key, &k, sizeof k), 0); + assert(r == 0); } DBC *cursor; @@ -444,9 +450,9 @@ void test_walk_empty(int n, int dup_mode) { assert(r == 0); { - DBT key, val; - int r = cursor->c_get(cursor, dbt_init_malloc(&key), dbt_init_malloc(&val), DB_NEXT); - assert(r != 0); + DBT key, val; + r = cursor->c_get(cursor, dbt_init_malloc(&key), dbt_init_malloc(&val), DB_NEXT); + assert(r != 0); } r = cursor->c_close(cursor); @@ -488,7 +494,7 @@ void test_icdi_search(int n, int dup_mode) { DBT key, val; r = db->get(db, null_txn, dbt_init(&key, &k, sizeof k), dbt_init_malloc(&val), 0); assert(r == 0); - int vv; + unsigned int vv; assert(val.size == sizeof vv); memcpy(&vv, val.data, val.size); assert(vv == htonl(0)); @@ -507,10 +513,12 @@ void test_icdi_search(int n, int dup_mode) { r = db->open(db, null_txn, fname, "main", DB_BTREE, 0, 0666); assert(r == 0); - int k = htonl(n/2); - DBT key; - r = db->del(db, null_txn, dbt_init(&key, &k, sizeof k), 0); - assert(r == 0); + { + int k = htonl(n/2); + DBT key; + r = db->del(db, null_txn, dbt_init(&key, &k, sizeof k), 0); + assert(r == 0); + } /* insert n duplicates */ for (i=0; iget(db, null_txn, dbt_init(&key, &k, sizeof k), dbt_init_malloc(&val), 0); assert(r == 0); - int vv; + unsigned int vv; assert(val.size == sizeof vv); memcpy(&vv, val.data, val.size); assert(vv == htonl(n)); @@ -575,7 +583,7 @@ void test_ici_search(int n, int dup_mode) { DBT key, val; r = db->get(db, null_txn, dbt_init(&key, &k, sizeof k), dbt_init_malloc(&val), 0); assert(r == 0); - int vv; + unsigned int vv; assert(val.size == sizeof vv); memcpy(&vv, val.data, val.size); assert(vv == htonl(0)); @@ -603,7 +611,7 @@ void test_ici_search(int n, int dup_mode) { DBT key, val; r = db->get(db, null_txn, dbt_init(&key, &k, sizeof k), dbt_init_malloc(&val), 0); assert(r == 0); - int vv; + unsigned int vv; assert(val.size == sizeof vv); memcpy(&vv, val.data, val.size); assert(vv == htonl(0)); diff --git a/src/tests/test_dup_flags.c b/src/tests/test_dup_flags.c index 99d3be099aa..9273f4cddac 100644 --- a/src/tests/test_dup_flags.c +++ b/src/tests/test_dup_flags.c @@ -13,7 +13,7 @@ #include "test.h" /* verify that the dup flags are written and read from the database file correctly */ -void test_dup_flags(int dup_flags) { +void test_dup_flags(u_int32_t dup_flags) { if (verbose) printf("test_dup_flags:%d\n", dup_flags); DB_ENV * const null_env = 0; diff --git a/src/tests/test_env_create_db_create.c b/src/tests/test_env_create_db_create.c index b24f0206d41..80ef881bddc 100644 --- a/src/tests/test_env_create_db_create.c +++ b/src/tests/test_env_create_db_create.c @@ -7,7 +7,9 @@ #include #include -int main (int argc, char *argv[]) { +#include "test.h" + +int main (int UU(argc), char UU(*argv[])) { DB_ENV *env; DB *db; int r; diff --git a/src/tests/test_error.c b/src/tests/test_error.c index 7b5ae6df02c..25a2480eacc 100644 --- a/src/tests/test_error.c +++ b/src/tests/test_error.c @@ -8,7 +8,7 @@ char const* expect_errpfx; int n_handle_error=0; -void handle_error (const DB_ENV *dbenv, const char *errpfx, const char *msg) { +void handle_error (const DB_ENV *UU(dbenv), const char *errpfx, const char *UU(msg)) { assert(errpfx==expect_errpfx); n_handle_error++; } diff --git a/src/tests/test_log0.c b/src/tests/test_log0.c index 21f07a008d6..956d0add04f 100644 --- a/src/tests/test_log0.c +++ b/src/tests/test_log0.c @@ -8,11 +8,13 @@ #include #include +#include "test.h" + // ENVDIR is defined in the Makefile DB_ENV *env; -int main (int argc, char *argv[]) { +int main (int UU(argc), char UU(*argv[])) { int r; system("rm -rf " ENVDIR); r=mkdir(ENVDIR, 0777); assert(r==0); diff --git a/src/tests/test_log1.c b/src/tests/test_log1.c index a827869d315..332ceafb170 100644 --- a/src/tests/test_log1.c +++ b/src/tests/test_log1.c @@ -11,15 +11,15 @@ #include #include +#include "test.h" + // ENVDIR is defined in the Makefile DB_ENV *env; DB *db; DB_TXN *tid; -#define CKERR(r) if (r!=0) fprintf(stderr, "%s:%d error %d %s\n", __FILE__, __LINE__, r, db_strerror(r)); assert(r==0); - -int main (int argc, char *argv[]) { +int main (int UU(argc), char UU(*argv[])) { int r; system("rm -rf " ENVDIR); r=mkdir(ENVDIR, 0777); assert(r==0); diff --git a/src/tests/test_log1_abort.c b/src/tests/test_log1_abort.c index 8f961d88ad9..55c17b4a540 100644 --- a/src/tests/test_log1_abort.c +++ b/src/tests/test_log1_abort.c @@ -12,15 +12,15 @@ #include #include +#include "test.h" + // ENVDIR is defined in the Makefile DB_ENV *env; DB *db; DB_TXN *tid; -#define CKERR(r) if (r!=0) fprintf(stderr, "%s:%d error %d %s\n", __FILE__, __LINE__, r, db_strerror(r)); assert(r==0); - -int main (int argc, char *argv[]) { +int main (int UU(argc), char UU(*argv[])) { int r; system("rm -rf " ENVDIR); r=mkdir(ENVDIR, 0777); assert(r==0); diff --git a/src/tests/test_log6a_abort.c b/src/tests/test_log6a_abort.c index 186d317bd46..15e917e0bab 100644 --- a/src/tests/test_log6a_abort.c +++ b/src/tests/test_log6a_abort.c @@ -67,11 +67,11 @@ void insert_pending(int key, int val, DB_TXN *bookx) { static void put_a_random_item (DB *db, DB_TXN *tid, int i, DB_TXN *bookx) { char hello[30], there[30]; DBT key,data; - int rand = myrandom(); - random_keys_mentioned[n_keys_mentioned++] = rand; - insert_pending(rand, i, bookx); - //printf("Insert %u\n", rand); - snprintf(hello, sizeof(hello), "hello%d.%d", rand, i); + int randv = myrandom(); + random_keys_mentioned[n_keys_mentioned++] = randv; + insert_pending(randv, i, bookx); + //printf("Insert %u\n", randv); + snprintf(hello, sizeof(hello), "hello%d.%d", randv, i); snprintf(there, sizeof(hello), "there%d", i); memset(&key, 0, sizeof(key)); memset(&data, 0, sizeof(data)); @@ -85,23 +85,23 @@ static void put_a_random_item (DB *db, DB_TXN *tid, int i, DB_TXN *bookx) { static void delete_a_random_item (DB *db, DB_TXN *tid, DB_TXN *bookx) { if (n_keys_mentioned==0) return; int ridx = myrandom()%n_keys_mentioned; - int rand = random_keys_mentioned[ridx]; + int randv = random_keys_mentioned[ridx]; DBT keyd; DBT vald; - //printf("Delete %u\n", rand); - dbt_init(&keyd, &rand, sizeof(rand)); - dbt_init(&vald, &rand, sizeof(rand)); + //printf("Delete %u\n", randv); + dbt_init(&keyd, &randv, sizeof(randv)); + dbt_init(&vald, &randv, sizeof(randv)); pending_i->del(pending_i, bookx, &keyd, 0); - delete_in_mem(rand, &peni_count, peni_data); + delete_in_mem(randv, &peni_count, peni_data); pending_d->put(pending_d, bookx, &keyd, &vald, 0); - insert_in_mem(rand, rand, &pend_count, pend_data); + insert_in_mem(randv, randv, &pend_count, pend_data); db->del(db, tid, &keyd, DB_DELETE_ANY); } -static void commit_items (DB_ENV *env, int i) { +static void commit_items (DB_ENV *env, int UU(i)) { //printf("commit_items %d\n", i); DB_TXN *txn; int r=env->txn_begin(env, 0, &txn, 0); assert(r==0); @@ -259,21 +259,21 @@ static void make_db (void) { r=env->txn_begin(env, 0, &bookx, 0); assert(r==0); for (i=0; iabort(tid); assert(r==0); r=bookx->commit(bookx, 0); assert(r==0); r=env->txn_begin(env, 0, &bookx, 0); assert(r==0); abort_items(env); r=env->txn_begin(env, 0, &tid, 0); assert(r==0); - } else if (rand%1000==1) { + } else if (randv%1000==1) { r=tid->commit(tid, 0); assert(r==0); r=bookx->commit(bookx, 0); assert(r==0); r=env->txn_begin(env, 0, &bookx, 0); assert(r==0); commit_items(env, i); r=env->txn_begin(env, 0, &tid, 0); assert(r==0); - } else if (rand%3==0) { + } else if (randv%3==0) { delete_a_random_item(db, tid, bookx); } else { put_a_random_item(db, tid, i, bookx); diff --git a/src/tests/test_logflush.c b/src/tests/test_logflush.c index 236c1243ccf..b00dfa3a0da 100644 --- a/src/tests/test_logflush.c +++ b/src/tests/test_logflush.c @@ -32,7 +32,7 @@ int grep_for_in_logs(const char *str) { return -1; } -int main (int argc, char *argv[]) { +int main (int UU(argc), char UU(*argv[])) { int r; DB_ENV *env; DB *db; diff --git a/src/tests/test_logmax.c b/src/tests/test_logmax.c index 018741fa098..f088c4addc2 100644 --- a/src/tests/test_logmax.c +++ b/src/tests/test_logmax.c @@ -50,7 +50,7 @@ void test_logmax (int logmax) { r=env->get_lg_max(env, &lmax); assert(r==0); if (logmax>0) { - assert(lmax==logmax); + assert(lmax==(u_int32_t)logmax); } else { assert(lmax>0); diff --git a/src/tests/test_set_lk_max_locks.c b/src/tests/test_set_lk_max_locks.c index f5a248d80ad..93e8136c43c 100644 --- a/src/tests/test_set_lk_max_locks.c +++ b/src/tests/test_set_lk_max_locks.c @@ -36,7 +36,7 @@ static void make_db (int n_locks) { assert(r == EINVAL); #endif r=env->get_lk_max_locks(env, &set_locks); - assert(r == 0 && set_locks == n_locks); + assert(r == 0 && set_locks == (u_int32_t)n_locks); } r=env->open(env, ENVDIR, DB_INIT_LOCK|DB_INIT_LOG|DB_INIT_MPOOL|DB_INIT_TXN|DB_CREATE|DB_PRIVATE, 0777); CKERR(r); r=db_create(&db, env, 0); CKERR(r); diff --git a/src/tests/test_thread_insert.c b/src/tests/test_thread_insert.c index 2c5bd494ed5..79cfd43b8b3 100644 --- a/src/tests/test_thread_insert.c +++ b/src/tests/test_thread_insert.c @@ -6,11 +6,7 @@ #include #include #include -#if defined(OSX) - #include -#else - #include -#endif +#include #include #include "test.h" diff --git a/src/tests/test_thread_secondary.c b/src/tests/test_thread_secondary.c index 2af8a7fdb67..87426e7414c 100644 --- a/src/tests/test_thread_secondary.c +++ b/src/tests/test_thread_secondary.c @@ -32,7 +32,7 @@ DB_ENV *dbenv; * getname -- extracts a secondary key (the last name) from a primary * key/data pair */ -int getname(DB *secondary, const DBT *pkey, const DBT *pdata, DBT *skey) +int getname(DB *UU(secondary), const DBT *UU(pkey), const DBT *pdata, DBT *skey) { /* * Since the secondary key is a simple structure member of the diff --git a/src/tests/test_txn_abort5a.c b/src/tests/test_txn_abort5a.c index bb877b947ec..0de69790d63 100644 --- a/src/tests/test_txn_abort5a.c +++ b/src/tests/test_txn_abort5a.c @@ -67,7 +67,7 @@ void test_txn_abort(int n) { if (r!=0) break; if (verbose>2) printf("%d present\n", ntohl(*(int*)key.data)); assert(key.size==4); - assert(ntohl(*(int*)key.data)==2*i); + assert(ntohl(*(int*)key.data)==(unsigned int)(2*i)); } assert(i==n); r = cursor->c_close(cursor); assert(r == 0); diff --git a/src/tests/test_txn_abort7.c b/src/tests/test_txn_abort7.c index 7f49dc6cd3f..4ee27ce63aa 100644 --- a/src/tests/test_txn_abort7.c +++ b/src/tests/test_txn_abort7.c @@ -49,7 +49,7 @@ void test_abort_create(void) { } -int main(int argc, char *argv[]) { +int main(int UU(argc), char UU(*argv[])) { test_abort_create(); return 0; } diff --git a/src/tests/test_txn_abort8.c b/src/tests/test_txn_abort8.c index 3d838a0e870..cd3b2aec7ac 100644 --- a/src/tests/test_txn_abort8.c +++ b/src/tests/test_txn_abort8.c @@ -52,7 +52,7 @@ void test_abort_close(void) { } -int main(int argc, char *argv[]) { +int main(int UU(argc), char UU(*argv[])) { test_abort_close(); return 0; } diff --git a/src/tests/test_txn_abort9.c b/src/tests/test_txn_abort9.c index 5e0e3aa8a34..af16756c2a6 100644 --- a/src/tests/test_txn_abort9.c +++ b/src/tests/test_txn_abort9.c @@ -57,7 +57,7 @@ void test_abort_close(void) { } -int main(int argc, char *argv[]) { +int main(int UU(argc), char UU(*argv[])) { test_abort_close(); return 0; } diff --git a/src/tests/test_txn_begin_commit.c b/src/tests/test_txn_begin_commit.c index bed62bbf25d..08e32999aab 100644 --- a/src/tests/test_txn_begin_commit.c +++ b/src/tests/test_txn_begin_commit.c @@ -5,7 +5,7 @@ #include "test.h" -int main(int argc, char *argv[]) { +int main(int UU(argc), char UU(*argv[])) { int r; DB_ENV *env; diff --git a/src/tests/test_txn_commit8.c b/src/tests/test_txn_commit8.c index 7e3faeba7ee..6e0a7168189 100644 --- a/src/tests/test_txn_commit8.c +++ b/src/tests/test_txn_commit8.c @@ -52,7 +52,7 @@ void test_abort_close(void) { } -int main(int argc, char *argv[]) { +int main(int UU(argc), char UU(*argv[])) { test_abort_close(); return 0; }