From 7693fa59c4470db729d85af99fb9cc3b264fa8c8 Mon Sep 17 00:00:00 2001 From: Alex Gorrod Date: Fri, 16 Sep 2016 16:22:54 +1000 Subject: Import wiredtiger: 5bc03723a7e77c96b1d5e45a97173654872c727a from branch mongodb-3.4 ref: deeb0f589a..5bc03723a7 for: 3.3.13 WT-2859 Improve statistics macros to not collect stats when statistics=none is set WT-2894 Create workload that shows negative scaling when overwhelmed WT-2900 Add ARM8 build support to WiredTiger and fix ARM CRC assembler tags WT-2902 Enhance eviction to work better with update heavy YCSB load WT-2905 dead code: MongoDB Coverity #99881 WT-2908 Add dry-run support to python unit-test WT-2910 test_inmem01 can abort due to stuck cache WT-2911 add support for gcc6 WT-2912 make --enable-strict run on the zseries test box WT-2913 stuck cache after latest merge WT-2914 Fix link error on OS/X for checksum_init call WT-2916 whitespace check not working --- src/third_party/wiredtiger/test/format/rebalance.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/third_party/wiredtiger/test/format/rebalance.c') diff --git a/src/third_party/wiredtiger/test/format/rebalance.c b/src/third_party/wiredtiger/test/format/rebalance.c index 5fd86ef3317..9849b7df82b 100644 --- a/src/third_party/wiredtiger/test/format/rebalance.c +++ b/src/third_party/wiredtiger/test/format/rebalance.c @@ -73,12 +73,14 @@ wts_rebalance(void) testutil_checkfmt(system(cmd), "command failed: %s", cmd); /* Compare the old/new versions of the object. */ - (void)snprintf(cmd, sizeof(cmd), #ifdef _WIN32 + (void)snprintf(cmd, sizeof(cmd), "fc /b %s\\rebalance.orig %s\\rebalance.new > NUL", + g.home, g.home); #else + (void)snprintf(cmd, sizeof(cmd), "cmp %s/rebalance.orig %s/rebalance.new > /dev/null", -#endif g.home, g.home); +#endif testutil_checkfmt(system(cmd), "command failed: %s", cmd); } -- cgit v1.2.1