diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-08-08 23:13:14 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-08-08 23:13:14 +0300 |
| commit | 1b53bea29aa836932ed6e00383dd6113721c1a73 (patch) | |
| tree | 9bf53f9f5ec33383efca6f371a557b2b7e5cb8fe /t | |
| parent | 6c5fbd866c89d939d6202a2594658234d4cf1e90 (diff) | |
| parent | 32ed3314c104733ea27e06a82efae569dacd825a (diff) | |
Merge branch 'js/t5351-freebsd-fix'
Some tests assumed that core.fsyncMethod=batch is supported
everywhere, which broke FreeBSD.
* js/t5351-freebsd-fix:
t5351: avoid using `test_cmp` for binary data
t5351: avoid relying on `core.fsyncMethod = batch` to be supported
Diffstat (limited to 't')
| -rwxr-xr-x | t/t5351-unpack-large-objects.sh | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/t/t5351-unpack-large-objects.sh b/t/t5351-unpack-large-objects.sh index f785cb0617..e936f91c3b 100755 --- a/t/t5351-unpack-large-objects.sh +++ b/t/t5351-unpack-large-objects.sh @@ -70,9 +70,15 @@ test_expect_success 'unpack big object in stream (core.fsyncmethod=batch)' ' GIT_TRACE2_EVENT="$(pwd)/trace2.txt" \ GIT_TEST_FSYNC=true \ git -C dest.git $BATCH_CONFIGURATION unpack-objects <pack-$PACK.pack && - check_fsync_events trace2.txt <<-\EOF && + if grep "core.fsyncMethod = batch is unsupported" trace2.txt + then + flush_count=7 + else + flush_count=1 + fi && + check_fsync_events trace2.txt <<-EOF && "key":"fsync/writeout-only","value":"6" - "key":"fsync/hardware-flush","value":"1" + "key":"fsync/hardware-flush","value":"$flush_count" EOF test_dir_is_empty dest.git/objects/pack && @@ -87,7 +93,7 @@ test_expect_success 'do not unpack existing large objects' ' # The destination came up with the exact same pack... DEST_PACK=$(echo dest.git/objects/pack/pack-*.pack) && - test_cmp pack-$PACK.pack $DEST_PACK && + cmp pack-$PACK.pack $DEST_PACK && # ...and wrote no loose objects test_stdout_line_count = 0 find dest.git/objects -type f ! -name "pack-*" |