From cef88998f261426ffd441bd7a1b98816a7b4776e Mon Sep 17 00:00:00 2001 From: Rich Prohaska Date: Tue, 16 Apr 2013 23:59:39 -0400 Subject: [PATCH] #3461 big blobs test should fail until we support large rows refs[t:3461] git-svn-id: file:///svn/toku/tokudb@30431 c7de825b-a66e-492c-adef-691d508d4ae1 --- src/tests/Makefile | 1 + src/tests/test_blobs_leaf_split.c | 26 +++++++++++++------------- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/src/tests/Makefile b/src/tests/Makefile index fcbf60a3a34..e3327d7bc22 100644 --- a/src/tests/Makefile +++ b/src/tests/Makefile @@ -320,6 +320,7 @@ BDB_BINS = $(patsubst %.c,%.bdb$(BINSUF),$(filter-out $(patsubst %,%.c,$(BDB_DON endif TDB_TESTS_THAT_SHOULD_FAIL= \ + test_blobs_leaf_split \ test_truncate_txn_abort \ test_db_no_env \ #\ ends prev line diff --git a/src/tests/test_blobs_leaf_split.c b/src/tests/test_blobs_leaf_split.c index b2272762100..234b7721a81 100644 --- a/src/tests/test_blobs_leaf_split.c +++ b/src/tests/test_blobs_leaf_split.c @@ -17,7 +17,7 @@ static void insert(DB *db, DB_TXN *txn, int k, int val_size) { DBT key = { .data = key_buffer, .size = sizeof key_buffer }; DBT value = { .data = val_buffer, .size = val_size }; - r = db->put(db, txn, &key, &value, 0); assert(r == 0); + r = db->put(db, txn, &key, &value, 0); assert_zero(r); toku_free(val_buffer); } @@ -64,43 +64,43 @@ int test_main(int argc, char * const argv[]) { int r; char rm_cmd[strlen(db_env_dir) + strlen("rm -rf ") + 1]; snprintf(rm_cmd, sizeof(rm_cmd), "rm -rf %s", db_env_dir); - r = system(rm_cmd); assert(r == 0); + r = system(rm_cmd); assert_zero(r); - r = toku_os_mkdir(db_env_dir, S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH); assert(r == 0); + r = toku_os_mkdir(db_env_dir, S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH); assert_zero(r); // create and open the env DB_ENV *db_env = NULL; - r = db_env_create(&db_env, 0); assert(r == 0); + r = db_env_create(&db_env, 0); assert_zero(r); if (cachesize) { const u_int64_t gig = 1 << 30; - r = db_env->set_cachesize(db_env, cachesize / gig, cachesize % gig, 1); assert(r == 0); + r = db_env->set_cachesize(db_env, cachesize / gig, cachesize % gig, 1); assert_zero(r); } if (!do_txn) db_env_open_flags &= ~(DB_INIT_TXN | DB_INIT_LOG); - r = db_env->open(db_env, db_env_dir, db_env_open_flags, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); assert(r == 0); + r = db_env->open(db_env, db_env_dir, db_env_open_flags, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); assert_zero(r); // create the db DB *db = NULL; - r = db_create(&db, db_env, 0); assert(r == 0); + r = db_create(&db, db_env, 0); assert_zero(r); DB_TXN *create_txn = NULL; if (do_txn) { - r = db_env->txn_begin(db_env, NULL, &create_txn, 0); assert(r == 0); + r = db_env->txn_begin(db_env, NULL, &create_txn, 0); assert_zero(r); } if (pagesize) { - r = db->set_pagesize(db, pagesize); assert(r == 0); + r = db->set_pagesize(db, pagesize); assert_zero(r); } - r = db->open(db, create_txn, db_filename, NULL, DB_BTREE, DB_CREATE, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); assert(r == 0); + r = db->open(db, create_txn, db_filename, NULL, DB_BTREE, DB_CREATE, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); assert_zero(r); insert(db, create_txn, 1, 8000000); insert(db, create_txn, 2, 1); if (do_txn) { - r = create_txn->commit(create_txn, 0); assert(r == 0); + r = create_txn->commit(create_txn, 0); assert_zero(r); } // shutdown - r = db->close(db, 0); assert(r == 0); db = NULL; - r = db_env->close(db_env, 0); assert(r == 0); db_env = NULL; + r = db->close(db, 0); assert_zero(r); db = NULL; + r = db_env->close(db_env, 0); assert_zero(r); db_env = NULL; return 0; }