diff options
Diffstat (limited to 'src/third_party/wiredtiger/test')
5 files changed, 19 insertions, 17 deletions
diff --git a/src/third_party/wiredtiger/test/csuite/schema_abort/main.c b/src/third_party/wiredtiger/test/csuite/schema_abort/main.c index 298c52469dd..e7f22571cc6 100644 --- a/src/third_party/wiredtiger/test/csuite/schema_abort/main.c +++ b/src/third_party/wiredtiger/test/csuite/schema_abort/main.c @@ -755,13 +755,13 @@ thread_run(void *arg) * can be viewed well in a binary dump. */ testutil_check(__wt_snprintf(cbuf, sizeof(cbuf), - "COLL: thread:%" PRIu64 " ts:%" PRIu64 " key: %" PRIu64, + "COLL: thread:%" PRIu32 " ts:%" PRIu64 " key: %" PRIu64, td->info, stable_ts, i)); testutil_check(__wt_snprintf(lbuf, sizeof(lbuf), - "LOCAL: thread:%" PRIu64 " ts:%" PRIu64 " key: %" PRIu64, + "LOCAL: thread:%" PRIu32 " ts:%" PRIu64 " key: %" PRIu64, td->info, stable_ts, i)); testutil_check(__wt_snprintf(obuf, sizeof(obuf), - "OPLOG: thread:%" PRIu64 " ts:%" PRIu64 " key: %" PRIu64, + "OPLOG: thread:%" PRIu32 " ts:%" PRIu64 " key: %" PRIu64, td->info, stable_ts, i)); data.size = __wt_random(&rnd) % MAX_VAL; data.data = cbuf; diff --git a/src/third_party/wiredtiger/test/csuite/timestamp_abort/main.c b/src/third_party/wiredtiger/test/csuite/timestamp_abort/main.c index 8c2b3c6f7e3..2645dfefe23 100644 --- a/src/third_party/wiredtiger/test/csuite/timestamp_abort/main.c +++ b/src/third_party/wiredtiger/test/csuite/timestamp_abort/main.c @@ -85,12 +85,12 @@ static volatile uint64_t global_ts = 1; #define ENV_CONFIG_DEF \ "cache_size=20M,create,log=(archive=true,file_max=10M,enabled)," \ "debug_mode=(table_logging=true,checkpoint_retention=5)," \ - "statistics=(fast),statistics_log=(wait=1,json=true),session_max=%" PRIu32 + "statistics=(fast),statistics_log=(wait=1,json=true),session_max=%d" #define ENV_CONFIG_TXNSYNC \ "cache_size=20M,create,log=(archive=true,file_max=10M,enabled)," \ "debug_mode=(table_logging=true,checkpoint_retention=5)," \ "statistics=(fast),statistics_log=(wait=1,json=true)," \ - "transaction_sync=(enabled,method=none),session_max=%" PRIu32 + "transaction_sync=(enabled,method=none),session_max=%d" #define ENV_CONFIG_REC "log=(archive=false,recover=on)" typedef struct { @@ -355,13 +355,13 @@ thread_run(void *arg) * can be viewed well in a binary dump. */ testutil_check(__wt_snprintf(cbuf, sizeof(cbuf), - "COLL: thread:%" PRIu64 " ts:%" PRIu64 " key: %" PRIu64, + "COLL: thread:%" PRIu32 " ts:%" PRIu64 " key: %" PRIu64, td->info, active_ts, i)); testutil_check(__wt_snprintf(lbuf, sizeof(lbuf), - "LOCAL: thread:%" PRIu64 " ts:%" PRIu64 " key: %" PRIu64, + "LOCAL: thread:%" PRIu32 " ts:%" PRIu64 " key: %" PRIu64, td->info, active_ts, i)); testutil_check(__wt_snprintf(obuf, sizeof(obuf), - "OPLOG: thread:%" PRIu64 " ts:%" PRIu64 " key: %" PRIu64, + "OPLOG: thread:%" PRIu32 " ts:%" PRIu64 " key: %" PRIu64, td->info, active_ts, i)); data.size = __wt_random(&rnd) % MAX_VAL; data.data = cbuf; @@ -455,11 +455,11 @@ run_workload(uint32_t nth) if (chdir(home) != 0) testutil_die(errno, "Child chdir: %s", home); if (inmem) - (void)__wt_snprintf(envconf, sizeof(envconf), - ENV_CONFIG_DEF, SESSION_MAX); + testutil_check(__wt_snprintf(envconf, sizeof(envconf), + ENV_CONFIG_DEF, SESSION_MAX)); else - (void)__wt_snprintf(envconf, sizeof(envconf), - ENV_CONFIG_TXNSYNC, SESSION_MAX); + testutil_check(__wt_snprintf(envconf, sizeof(envconf), + ENV_CONFIG_TXNSYNC, SESSION_MAX)); if (compat) strcat(envconf, ENV_CONFIG_COMPAT); diff --git a/src/third_party/wiredtiger/test/format/util.c b/src/third_party/wiredtiger/test/format/util.c index 6214f604378..874d99cd167 100644 --- a/src/third_party/wiredtiger/test/format/util.c +++ b/src/third_party/wiredtiger/test/format/util.c @@ -277,15 +277,16 @@ track(const char *tag, uint64_t cnt, TINFO *tinfo) if (tinfo == NULL && cnt == 0) testutil_check(__wt_snprintf_len_set( - msg, sizeof(msg), &len, "%4d: %s", g.run_cnt, tag)); + msg, sizeof(msg), &len, + "%4" PRIu32 ": %s", g.run_cnt, tag)); else if (tinfo == NULL) testutil_check(__wt_snprintf_len_set( msg, sizeof(msg), &len, - "%4d: %s: %" PRIu64, g.run_cnt, tag, cnt)); + "%4" PRIu32 ": %s: %" PRIu64, g.run_cnt, tag, cnt)); else testutil_check(__wt_snprintf_len_set( msg, sizeof(msg), &len, - "%4d: %s: " + "%4" PRIu32 ": %s: " "search %" PRIu64 "%s, " "insert %" PRIu64 "%s, " "update %" PRIu64 "%s, " diff --git a/src/third_party/wiredtiger/test/syscall/wt2336_base/base.run b/src/third_party/wiredtiger/test/syscall/wt2336_base/base.run index b51e24a2c06..ed501f50ce4 100644 --- a/src/third_party/wiredtiger/test/syscall/wt2336_base/base.run +++ b/src/third_party/wiredtiger/test/syscall/wt2336_base/base.run @@ -134,6 +134,7 @@ close(fd); pwrite64(wt, ""..., 0x1000, 0x1000); pwrite64(wt, ""..., 0x1000, 0x2000); pwrite64(wt, ""..., 0x1000, 0x3000); +pwrite64(wt, ""..., 0x1000, 0x4000); #ifdef __linux__ fdatasync(wt); #endif /* __linux__ */ diff --git a/src/third_party/wiredtiger/test/thread/rw.c b/src/third_party/wiredtiger/test/thread/rw.c index f874695d584..cf38157f59f 100644 --- a/src/third_party/wiredtiger/test/thread/rw.c +++ b/src/third_party/wiredtiger/test/thread/rw.c @@ -65,7 +65,7 @@ rw_start(u_int readers, u_int writers) if (i == 0 || multiple_files) { run_info[i].name = dmalloc(64); testutil_check(__wt_snprintf( - run_info[i].name, 64, FNAME, i)); + run_info[i].name, 64, FNAME, (int)i)); /* Vary by orders of magnitude */ if (vary_nops) @@ -88,7 +88,7 @@ rw_start(u_int readers, u_int writers) /* Have readers read from tables with writes. */ name_index = i % writers; testutil_check(__wt_snprintf( - run_info[offset].name, 64, FNAME, name_index)); + run_info[offset].name, 64, FNAME, (int)name_index)); /* Vary by orders of magnitude */ if (vary_nops) |