Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion codex-rs/core/tests/remote_env_windows/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ wine_rust_test(
crate_name = "remote_env_windows_test",
crate_root = "remote_env_windows_test.rs",
windows_binaries = {
"wine-windows-exec-server": "//codex-rs/exec-server/testing:windows-exec-server",
"wine-windows-exec-server": "//codex-rs/exec-server/testing:exec-server",
},
deps = [
"//codex-rs/core/tests/common",
Expand Down
10 changes: 4 additions & 6 deletions codex-rs/exec-server/testing/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,11 @@ rust_binary(
)

rust_binary(
name = "windows-exec-server",
name = "exec-server",
testonly = True,
srcs = ["windows_exec_server.rs"],
crate_name = "windows_exec_server",
crate_root = "windows_exec_server.rs",
tags = ["manual"],
target_compatible_with = ["@platforms//os:windows"],
srcs = ["exec_server.rs"],
crate_name = "exec_server",
crate_root = "exec_server.rs",
visibility = ["//visibility:public"],
deps = [
"//codex-rs/exec-server",
Expand Down
14 changes: 14 additions & 0 deletions codex-rs/exec-server/testing/exec_server.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
//! Minimal exec-server fixture for Bazel-only integration tests.
//!
//! Linking only exec-server avoids depending on the full Codex CLI binary
//! when a test only needs a WebSocket executor endpoint.

use codex_exec_server::ExecServerRuntimePaths;

#[tokio::main]
async fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
let current_exe = std::env::current_exe()?;
let runtime_paths =
ExecServerRuntimePaths::new(current_exe, /*codex_linux_sandbox_exe*/ None)?;
Comment thread
anp-oai marked this conversation as resolved.
codex_exec_server::run_main("ws://127.0.0.1:0", runtime_paths).await
}
18 changes: 0 additions & 18 deletions codex-rs/exec-server/testing/windows_exec_server.rs

This file was deleted.

2 changes: 1 addition & 1 deletion defs.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -538,7 +538,7 @@ def codex_rust_crate(
wine_exec_server = wine_test_name + "-windows-exec-server"
foreign_platform_binary(
name = wine_exec_server,
binary = "//codex-rs/exec-server/testing:windows-exec-server",
binary = "//codex-rs/exec-server/testing:exec-server",
extra_rustc_flags = WINDOWS_GNULLVM_RUSTC_LINK_FLAGS,
platform = "//:windows_x86_64_gnullvm",
tags = ["manual"],
Expand Down
Loading