mirror of
https://github.com/open-goal/jak-project
synced 2026-08-07 02:06:59 -04:00
Alexander J. Semenuk
5d5e35fb9b
## Problem Windows builds break with a current local toolchain (Scoop LLVM 22.1.8, CMake 4.4.0, VS 2026), in two independent ways: 1. The build stops at curl's deliberate guard: `#error "no non-blocking method was found/used/set"` in `third-party/curl/lib/nonblock.c`. 2. From the second configure onward, `cmake --build` re-runs CMake in an endless loop (observed 42 consecutive reconfigure cycles in a single build). Likely the same mechanism behind the "endlessly building" VS 2026 note in `docs/setup/dev/vs.md`. ## Root cause 1. `third-party/curl/CMake/CurlTests.c` passes `int *` to `ioctlsocket()`, whose third parameter is `u_long *`. Clang 22 promotes `-Wincompatible-pointer-types` to a hard error in C, so the `HAVE_IOCTLSOCKET_FIONBIO` try_compile silently fails and `curl_config.h` never defines it. Upstream CI does not see this because the windows-2022 runner image ships an older LLVM. GCC 14 promotes the same warning to a hard error, which is very likely the `CurlTests.c.obj` failure reported from MSYS2 in open-goal/jak-project#3551. Upstream curl hit the identical problem with GCC 14 and fixed the probe in curl 8.8.0 (curl/curl#13578). 2. The root CMakeLists copies the build tree's `compile_commands.json` into `<src>/build/` for clangd using `configure_file()`, which registers its input as a configure dependency. CMake rewrites `compile_commands.json` late in every generation, after `CTestTestfile.cmake` and `cmake_install.cmake` (outputs of the same Ninja regen rule), so once the dependency is registered the rule is deterministically dirty and every `ninja` invocation re-runs CMake. A pristine first configure is safe (the file does not exist yet, so the `if(EXISTS ...)` guard skips the copy), which is why the loop looks machine- or IDE-specific. ## Fix 1. Per review, re-vendor `third-party/curl` at the `curl-8_21_0` tag (previously `curl-8_3_0`), which carries the upstream probe fix plus two years of upstream development; `vendor.yaml` updated to match. Adjustments the version jump forced: - curl 8.15 removed the native macOS Secure Transport backend (`CURL_USE_SECTRANSP`), so macOS now builds curl against OpenSSL like Linux. The two macOS workflows install Homebrew `openssl@3` and export `OPENSSL_ROOT_DIR` (keg-only), and the macOS setup docs gained the same two lines. - `CURL_BROTLI` / `CURL_ZSTD` switched to AUTO-detection in curl 8.10; pinned OFF to keep the previous no-compression behavior and avoid silently linking whatever the CI images happen to have. - curl's new top-level `BUILD_EXAMPLES` cache option (default ON) leaked into discord-rpc's identically named option and broke configure at a nonexistent `examples/send-presence` directory; pinned OFF ahead of the third-party subdirectories. The diff is dominated by the mechanical tag-tree swap under `third-party/curl` (linguist-vendored, collapsed in review). The hand-written changes are `CMakeLists.txt`, the two macOS workflows, `docs/setup/system/macos.md`, and `vendor.yaml`. 2. Swap `configure_file()` for `file(COPY ...)`: the same clangd copy with no configure dependency registered. (`file(COPY_FILE ... ONLY_IF_DIFFERENT)` would be cleaner still but requires CMake 3.21, above the declared `cmake_minimum_required(VERSION 3.10)`.) ## Test plan - [x] Fresh `cmake --preset Release-windows-clang` (LLVM 22, no cache seeding) completes and logs `Enabled SSL backends: Schannel`; the FIONBIO probe passes without the previous `#error` - [x] Full Windows Release build from scratch in the branch worktree (all 1422 targets) - [x] goalc-test suite: 1509 passed, 0 failed - [x] Second consecutive configure with `compile_commands.json` present: the regen rule in `build.ninja` has no `compile_commands.json` input; `<src>/build/compile_commands.json` is still refreshed for clangd - [x] Repeated `ninja` invocations after a full build no longer re-run CMake - [x] macOS Intel and ARM CI green (first exercise of the OpenSSL backend switch) --- I work off a self-hosted forge, so this GitHub account is quiet; the configure logs and ninja dirty-node traces from the investigation are available if anyone wants the raw data. (AI-assisted)
132 lines
5.9 KiB
Python
Vendored
Generated
132 lines
5.9 KiB
Python
Vendored
Generated
#!/usr/bin/env python3
|
|
# -*- coding: utf-8 -*-
|
|
#***************************************************************************
|
|
# _ _ ____ _
|
|
# Project ___| | | | _ \| |
|
|
# / __| | | | |_) | |
|
|
# | (__| |_| | _ <| |___
|
|
# \___|\___/|_| \_\_____|
|
|
#
|
|
# Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.
|
|
#
|
|
# This software is licensed as described in the file COPYING, which
|
|
# you should have received as part of this distribution. The terms
|
|
# are also available at https://curl.se/docs/copyright.html.
|
|
#
|
|
# You may opt to use, copy, modify, merge, publish, distribute and/or sell
|
|
# copies of the Software, and permit persons to whom the Software is
|
|
# furnished to do so, under the terms of the COPYING file.
|
|
#
|
|
# This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
|
|
# KIND, either express or implied.
|
|
#
|
|
# SPDX-License-Identifier: curl
|
|
#
|
|
###########################################################################
|
|
#
|
|
import logging
|
|
import os
|
|
from typing import Generator
|
|
|
|
import pytest
|
|
from testenv import CurlClient, Dnsd, Env
|
|
|
|
log = logging.getLogger(__name__)
|
|
|
|
|
|
@pytest.mark.skipif(condition=not Env.curl_is_debug(), reason="needs curl debug")
|
|
@pytest.mark.skipif(condition=not Env.curl_override_dns(), reason="no DNS override")
|
|
@pytest.mark.skipif(condition=not Env.curl_has_feature('HTTPSRR'), reason="no HTTPSRR support")
|
|
class TestHTTPSRR:
|
|
|
|
@pytest.fixture(scope='class')
|
|
def dnsd(self, env: Env) -> Generator[Dnsd, None, None]:
|
|
dnsd = Dnsd(env=env)
|
|
assert dnsd.initial_start()
|
|
yield dnsd
|
|
dnsd.stop()
|
|
|
|
# dnsd a HTTPS-RR that prefers HTTP/1.1.
|
|
def test_22_01_httpsrr_h1(self, env: Env, httpd, dnsd):
|
|
dnsd.set_answers(addr_a=['127.0.0.1'],
|
|
https=['10 . alpn=http/1.1'])
|
|
run_env = os.environ.copy()
|
|
run_env['CURL_DNS_SERVER'] = f'127.0.0.1:{dnsd.port}'
|
|
run_env['CURL_DBG_AWAIT_HTTPSRR'] = '1'
|
|
run_env['CURL_QUICK_EXIT'] = '1'
|
|
run_env['CURL_DEBUG'] = 'dns,https-connect'
|
|
curl = CurlClient(env=env, run_env=run_env, force_resolv=False)
|
|
url = f'https://{env.authority_for(env.domain1, "http/1.1")}/data.json'
|
|
r = curl.http_download(urls=[url], with_stats=True)
|
|
r.check_exit_code(0)
|
|
r.check_stats(count=1, http_status=200, exitcode=0)
|
|
assert r.stats[0]['http_version'] == '1.1', f'{r}'
|
|
|
|
# dnsd a HTTPS-RR that prefers HTTP/2, this overrides the --http3 option.
|
|
@pytest.mark.skipif(condition=not Env.have_h3(), reason="missing HTTP/3 support")
|
|
def test_22_02_httpsrr_h3(self, env: Env, httpd, dnsd, nghttpx):
|
|
dnsd.set_answers(addr_a=['127.0.0.1'],
|
|
https=['10 . alpn=h2'])
|
|
run_env = os.environ.copy()
|
|
run_env['CURL_DNS_SERVER'] = f'127.0.0.1:{dnsd.port}'
|
|
run_env['CURL_DBG_AWAIT_HTTPSRR'] = '1'
|
|
run_env['CURL_QUICK_EXIT'] = '1'
|
|
run_env['CURL_DEBUG'] = 'dns,https-connect'
|
|
curl = CurlClient(env=env, run_env=run_env, force_resolv=False)
|
|
url = f'https://{env.authority_for(env.domain1, "http/1.1")}/data.json'
|
|
r = curl.http_download(urls=[url], with_stats=True, extra_args=[
|
|
'--http3'
|
|
])
|
|
r.check_exit_code(0)
|
|
r.check_stats(count=1, http_status=200, exitcode=0)
|
|
assert r.stats[0]['http_version'] == '2', f'{r}'
|
|
|
|
# dnsd a HTTPS-RR that prefers HTTP/3.
|
|
@pytest.mark.skipif(condition=not Env.have_h3(), reason="missing HTTP/3 support")
|
|
def test_22_03_httpsrr_h3(self, env: Env, httpd, dnsd, nghttpx):
|
|
dnsd.set_answers(addr_a=['127.0.0.1'],
|
|
https=['10 . alpn=h3,h2'])
|
|
run_env = os.environ.copy()
|
|
run_env['CURL_DNS_SERVER'] = f'127.0.0.1:{dnsd.port}'
|
|
run_env['CURL_DBG_AWAIT_HTTPSRR'] = '1'
|
|
run_env['CURL_QUICK_EXIT'] = '1'
|
|
run_env['CURL_DEBUG'] = 'dns,https-connect'
|
|
curl = CurlClient(env=env, run_env=run_env, force_resolv=False)
|
|
url = f'https://{env.authority_for(env.domain1, "http/1.1")}/data.json'
|
|
r = curl.http_download(urls=[url], with_stats=True)
|
|
r.check_exit_code(0)
|
|
r.check_stats(count=1, http_status=200, exitcode=0)
|
|
assert r.stats[0]['http_version'] == '3', f'{r}'
|
|
|
|
# dnsd a HTTPS-RR that prefers HTTP/1.1 for another target, so ignored.
|
|
def test_22_04_httpsrr_wrong_target(self, env: Env, httpd, dnsd):
|
|
dnsd.set_answers(addr_a=['127.0.0.1'],
|
|
https=['10 another alpn=http/1.1'])
|
|
run_env = os.environ.copy()
|
|
run_env['CURL_DNS_SERVER'] = f'127.0.0.1:{dnsd.port}'
|
|
run_env['CURL_DBG_AWAIT_HTTPSRR'] = '1'
|
|
run_env['CURL_QUICK_EXIT'] = '1'
|
|
run_env['CURL_DEBUG'] = 'dns,https-connect'
|
|
curl = CurlClient(env=env, run_env=run_env, force_resolv=False)
|
|
url = f'https://{env.authority_for(env.domain1, "http/1.1")}/data.json'
|
|
r = curl.http_download(urls=[url], with_stats=True)
|
|
r.check_exit_code(0)
|
|
r.check_stats(count=1, http_status=200, exitcode=0)
|
|
assert r.stats[0]['http_version'] == '2', f'{r}'
|
|
|
|
# dnsd a HTTPS-RR with no-default-alpn, ignored by curl for now
|
|
def test_22_05_httpsrr_no_default_alpn(self, env: Env, httpd, dnsd):
|
|
dnsd.set_answers(addr_a=['127.0.0.1'],
|
|
https=['10 . no-default-alpn alpn=http/1.1'])
|
|
run_env = os.environ.copy()
|
|
run_env['CURL_DNS_SERVER'] = f'127.0.0.1:{dnsd.port}'
|
|
run_env['CURL_DBG_AWAIT_HTTPSRR'] = '1'
|
|
run_env['CURL_QUICK_EXIT'] = '1'
|
|
run_env['CURL_DEBUG'] = 'dns,https-connect'
|
|
curl = CurlClient(env=env, run_env=run_env, force_resolv=False)
|
|
url = f'https://{env.authority_for(env.domain1, "http/1.1")}/data.json'
|
|
r = curl.http_download(urls=[url], with_stats=True)
|
|
r.check_exit_code(0)
|
|
r.check_stats(count=1, http_status=200, exitcode=0)
|
|
assert r.stats[0]['http_version'] == '2', f'{r}'
|