mirror of
https://github.com/open-goal/jak-project
synced 2026-08-21 23:00:45 -04:00
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)
196 lines
6.2 KiB
Python
Vendored
Generated
196 lines
6.2 KiB
Python
Vendored
Generated
# ***************************************************************************
|
|
# _ _ ____ _
|
|
# 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
|
|
import platform
|
|
import sys
|
|
from typing import Generator, Union
|
|
|
|
import pytest
|
|
from testenv.env import EnvConfig
|
|
|
|
sys.path.append(os.path.join(os.path.dirname(__file__), "."))
|
|
|
|
from testenv import Env, Httpd, Nghttpx, NghttpxFwd, NghttpxQuic, Sshd
|
|
from testenv.h2o import H2oProxy, H2oServer
|
|
|
|
log = logging.getLogger(__name__)
|
|
|
|
|
|
def pytest_report_header(config):
|
|
# Env inits its base properties only once, we can report them here
|
|
env = Env()
|
|
report = [
|
|
f"Testing curl {env.curl_version()}",
|
|
f" platform: {platform.platform()}",
|
|
f" curl: Version: {env.curl_version_string()}",
|
|
f" curl: Features: {env.curl_features_string()}",
|
|
f" curl: Protocols: {env.curl_protocols_string()}",
|
|
f" httpd: {env.httpd_version()}",
|
|
f" httpd-proxy: {env.httpd_version()}",
|
|
]
|
|
if env.have_h3():
|
|
report.extend([f" nghttpx: {env.nghttpx_version()}"])
|
|
if env.have_h2o():
|
|
report.extend([f" h2o: {env.h2o_version()}"])
|
|
if env.has_caddy():
|
|
report.extend([f" Caddy: {env.caddy_version()}"])
|
|
if env.has_vsftpd():
|
|
report.extend([f" VsFTPD: {env.vsftpd_version()}"])
|
|
buildinfo_fn = os.path.join(env.build_dir, "buildinfo.txt")
|
|
if os.path.exists(buildinfo_fn):
|
|
with open(buildinfo_fn, "r") as file_in:
|
|
for line in file_in:
|
|
line = line.strip()
|
|
if line and not line.startswith("#"):
|
|
report.extend([line])
|
|
return "\n".join(report)
|
|
|
|
|
|
@pytest.fixture(scope="session")
|
|
def env_config(pytestconfig, testrun_uid, worker_id) -> EnvConfig:
|
|
return EnvConfig(
|
|
pytestconfig=pytestconfig, testrun_uid=testrun_uid, worker_id=worker_id
|
|
)
|
|
|
|
|
|
@pytest.fixture(scope="session", autouse=True)
|
|
def env(pytestconfig, env_config) -> Env:
|
|
env = Env(pytestconfig=pytestconfig, env_config=env_config)
|
|
level = logging.DEBUG if env.verbose > 0 else logging.INFO
|
|
logging.getLogger("").setLevel(level=level)
|
|
if not env.curl_has_protocol("http"):
|
|
pytest.skip("curl built without HTTP support")
|
|
if not env.curl_has_protocol("https"):
|
|
pytest.skip("curl built without HTTPS support")
|
|
if env.setup_incomplete():
|
|
pytest.skip(env.incomplete_reason())
|
|
|
|
env.setup()
|
|
return env
|
|
|
|
|
|
@pytest.fixture(scope="session")
|
|
def httpd(env) -> Generator[Httpd, None, None]:
|
|
httpd = Httpd(env=env)
|
|
if not httpd.exists():
|
|
pytest.skip(f"httpd not found: {env.httpd}")
|
|
httpd.clear_logs()
|
|
assert httpd.initial_start()
|
|
yield httpd
|
|
httpd.stop()
|
|
|
|
|
|
@pytest.fixture(scope="session")
|
|
def nghttpx(env, httpd) -> Generator[Union[Nghttpx, bool], None, None]:
|
|
nghttpx = NghttpxQuic(env=env)
|
|
if nghttpx.exists():
|
|
if not nghttpx.supports_h3() and env.have_h3_curl():
|
|
log.warning("nghttpx does not support QUIC, but curl does")
|
|
nghttpx.clear_logs()
|
|
assert nghttpx.initial_start()
|
|
yield nghttpx
|
|
nghttpx.stop()
|
|
else:
|
|
yield False
|
|
|
|
|
|
@pytest.fixture(scope="session")
|
|
def nghttpx_fwd(env, httpd) -> Generator[Union[Nghttpx, bool], None, None]:
|
|
nghttpx = NghttpxFwd(env=env)
|
|
if nghttpx.exists():
|
|
nghttpx.clear_logs()
|
|
assert nghttpx.initial_start()
|
|
yield nghttpx
|
|
nghttpx.stop()
|
|
else:
|
|
yield False
|
|
|
|
|
|
@pytest.fixture(scope="session")
|
|
def sshd(env: Env) -> Generator[Union[Sshd, bool], None, None]:
|
|
if env.has_sshd():
|
|
sshd = Sshd(env=env)
|
|
assert sshd.initial_start(), f"{sshd.dump_log()}"
|
|
yield sshd
|
|
sshd.stop()
|
|
else:
|
|
yield False
|
|
|
|
|
|
@pytest.fixture(scope="session")
|
|
def configures_httpd(env, httpd) -> Generator[bool, None, None]:
|
|
# include this fixture as test parameter if the test configures httpd itself
|
|
yield True
|
|
|
|
|
|
@pytest.fixture(scope="session")
|
|
def configures_nghttpx(env, httpd) -> Generator[bool, None, None]:
|
|
# include this fixture as test parameter if the test configures nghttpx itself
|
|
yield True
|
|
|
|
|
|
@pytest.fixture(autouse=True, scope="function")
|
|
def server_reset(request, env, httpd, nghttpx):
|
|
# make sure httpd is in default configuration when a test starts
|
|
if "configures_httpd" not in request.node._fixtureinfo.argnames:
|
|
httpd.reset_config()
|
|
httpd.reload_if_config_changed()
|
|
if (
|
|
env.have_h3()
|
|
and "nghttpx" in request.node._fixtureinfo.argnames
|
|
and "configures_nghttpx" not in request.node._fixtureinfo.argnames
|
|
):
|
|
nghttpx.reset_config()
|
|
nghttpx.reload_if_config_changed()
|
|
|
|
|
|
@pytest.fixture(scope="session")
|
|
def h2o_server(env) -> Generator[Union[H2oServer, bool], None, None]:
|
|
h2o = H2oServer(env=env)
|
|
if env.have_h2o():
|
|
h2o.clear_logs()
|
|
if not h2o.initial_start():
|
|
h2o_logs = "\n".join(h2o.dump_logs())
|
|
pytest.skip(f"h2o server failed to start\n{h2o_logs}")
|
|
yield h2o
|
|
h2o.kill()
|
|
else:
|
|
yield False
|
|
|
|
|
|
@pytest.fixture(scope="session")
|
|
def h2o_proxy(env) -> Generator[Union[H2oProxy, bool], None, None]:
|
|
h2o = H2oProxy(env=env)
|
|
if env.have_h2o():
|
|
h2o.clear_logs()
|
|
if not h2o.initial_start():
|
|
h2o_logs = "\n".join(h2o.dump_logs())
|
|
pytest.skip(f"h2o proxy failed to start\n{h2o_logs}")
|
|
yield h2o
|
|
h2o.kill()
|
|
else:
|
|
yield False
|