conflict-set

2 Commits

Author	SHA1	Message	Date
weaselbotandandrew	60881419b8	Assert return values in test_update_zero_should_commit / conflict CI / release (arm64, ubuntu-latest-arm64) (pull_request) Successful in 3m22s Details CI / pre-commit (pull_request) Successful in 2m13s Details CI / test (-DCMAKE_BUILD_TYPE=Debug, debug) (pull_request) Successful in 3m36s Details CI / test (-DCMAKE_CXX_FLAGS=-DUSE_64_BIT=1, 64-bit-versions) (pull_request) Successful in 3m28s Details CI / test (-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++, gcc) (pull_request) Successful in 3m37s Details CI / test (-DUSE_SIMD_FALLBACK=ON, simd-fallback) (pull_request) Successful in 3m27s Details CI / release (amd64, ubuntu-latest-amd64) (pull_request) Successful in 4m53s Details CI / coverage (pull_request) Successful in 3m37s Details Add the missing [Result.COMMIT] / [Result.CONFLICT] assertions so that the two regression tests actually verify the expected conflict-set outcome, not just that the calls do not crash.	2026-06-22 14:09:10 -04:00
weaselbotandandrew	742d920aa1	Set restype=None for void-returning C functions in conflict_set.py CI / release (arm64, ubuntu-latest-arm64) (pull_request) Successful in 3m28s Details CI / pre-commit (pull_request) Successful in 2m14s Details CI / test (-DCMAKE_BUILD_TYPE=Debug, debug) (pull_request) Successful in 3m39s Details CI / test (-DCMAKE_CXX_FLAGS=-DUSE_64_BIT=1, 64-bit-versions) (pull_request) Successful in 3m33s Details CI / test (-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++, gcc) (pull_request) Successful in 3m44s Details CI / test (-DUSE_SIMD_FALLBACK=ON, simd-fallback) (pull_request) Successful in 3m32s Details CI / release (amd64, ubuntu-latest-amd64) (pull_request) Failing after 4m25s Details CI / coverage (pull_request) Failing after 3m20s Details ConflictSet_check, ConflictSet_addWrites, ConflictSet_setOldestVersion, and ConflictSet_destroy return void in C, but the Python wrapper left their ctypes restype at the default c_int. Set restype = None for each to match the C API contract and avoid undefined behavior from reading the return register of void functions.	2026-06-21 19:25:27 -04:00