From 643abd5eb512dbf218f28927b241fce53cdbd6fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Tue, 27 Oct 2026 23:13:36 +0100 Subject: [PATCH] adhoc_multi: Use the host's built-in relay with --relay Co-Authored-By: Claude Opus 5.5 --- Tools/adhoc_multi.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Tools/adhoc_multi.py b/Tools/adhoc_multi.py index 20b7500de5..331ef37129 100644 --- a/Tools/adhoc_multi.py +++ b/Tools/adhoc_multi.py @@ -8,9 +8,10 @@ # binds to 127.0.0.N, so on macOS the loopback aliases have to exist first: # sudo ifconfig lo0 alias 127.0.0.2 up (and .3, .4, ... for more clients) # -# With --relay, the instances instead use an aemu_postoffice server already running on this machine -# (adhocctl on 27312, relay on 27313; see ext/aemu_postoffice/hosting.md), in relay mode. The relay -# tells players apart by MAC, so they can all share 127.0.0.1 and no aliases are needed. +# With --relay, the instances use the relay in relay mode (on 27313, next to adhocctl on 27312). The host's +# built-in server runs one, unless an aemu_postoffice server is already running on this machine (see +# ext/aemu_postoffice/hosting.md). The relay tells players apart by MAC, so they can all share 127.0.0.1 +# and no aliases are needed. # # Usage: python3 Tools/adhoc_multi.py [--headless PATH] [--relay] net/adhoc/pair/basic [more tests...] @@ -66,7 +67,7 @@ def run_test(headless, test, extra, relay_ini): "--graphics=software", "--memstick=" + memstick, "--realtime", "--instance=%d" % (i + 1)] if relay_ini: cmd.append("--appendconfig=" + relay_ini) - elif i == 0: + if i == 0: cmd.append("--adhoc-server") cmd += extra cmd.append(os.path.join(TESTS_DIR, "%s_%s.prx" % (test, role)))