[Midnightbsd-cvs] [MidnightBSD/mports] 73ace5: x11/gnome-console: don't clobber DISPLAY in TEST_ENV

[Lucas Holt]

  Branch: refs/heads/x11/gnome-console-50
  Home:   https://github.com/MidnightBSD/mports
  Commit: 73ace55e2c662bf96bcecae72504d86ab5337d49
      https://github.com/MidnightBSD/mports/commit/73ace55e2c662bf96bcecae72504d86ab5337d49
  Author: Lucas Holt <luke at foolishgames.com>
  Date:   2026-09-11 (Fri, 11 Sep 2026)

  Changed paths:
    M x11/gnome-console/Makefile

  Log Message:
  -----------
  x11/gnome-console: don't clobber DISPLAY in TEST_ENV

Mk/extensions/display.mk only defines XVFBPORT when DISPLAY is unset at
the time USES=display is processed. On a builder that already has
DISPLAY set, "TEST_ENV+= DISPLAY=:${XVFBPORT}" expanded to a bare
"DISPLAY=:", breaking bmake test:

    $ env DISPLAY=:99 bmake -V TEST_ENV
    DISPLAY=:

Guard the assignment the way devel/blueprint-compiler does, so an
already-set DISPLAY is passed through and the Xvfb port is only used
when the extension actually allocated one.

    $ env -u DISPLAY bmake -V TEST_ENV
    DISPLAY=":0"
    $ env DISPLAY=:99 bmake -V TEST_ENV
    DISPLAY=":99"
    $ env DISPLAY=localhost:10.0 bmake -V TEST_ENV
    DISPLAY="localhost:10.0"

Reported in review of #1233.

Co-Authored-By: Claude Opus 5 (1M context) <noreply at anthropic.com>
Claude-Session: https://claude.ai/code/session_017JRCQA17KgZSRk2vV96wbT
Signed-off-by: Lucas Holt <luke at foolishgames.com>
AI-Assisted-by: Claude Opus 5 <noreply at anthropic.com>



To unsubscribe from these emails, change your notification settings at https://github.com/MidnightBSD/mports/settings/notifications