Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "[build] Hotfix CTest regex for MODULE.bazel build output" #22436

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Revert "[build] Hotfix CTest regex for MODULE.bazel build output" #22436

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
504c222
Revert "[build] Hotfix CTest regex for MODULE.bazel build output"
jwnimmer-tri Jan 9, 2025
f2964fe
DNM Revert "[build] Silence console spam from the snopt repository rule"
jwnimmer-tri Jan 13, 2025
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
18 changes: 16 additions & 2 deletions CTestCustom.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,23 @@ string(ASCII 27 ESC)
# (i.e., [ without matching ]) and that element must be the last element of the
# list.

# Never ever EVER _**EVER**_ should CTest fail the build of its own accord.
# "DEBUG" emitted by Bazel may be colored yellow (CSI 33m), "WARNING" emitted
# by Bazel may be colored magenta (CSI 35m), and "warning" emitted by Clang may
# be colored magenta (CSI 35m) and bolded (CSI 1m).
list(APPEND CTEST_CUSTOM_ERROR_EXCEPTION
".*"
"^DEBUG: "
": DrakeDeprecationWarning: "
": SyntaxWarning: invalid escape sequence "
"^WARNING: "
": warning: "
":[0-9]+: Failure$"
"(^${ESC}\\[33mDEBUG|^${ESC}\\[35mWARNING|: ${ESC}\\[0m${ESC}\\[0\;1\;35mwarning): ${ESC}\\[0m"
)

# "ERROR" emitted by Bazel may be colored red (CSI 31m) and bolded (CSI 1m).
list(APPEND CTEST_CUSTOM_ERROR_MATCH
"^ERROR: "
"^${ESC}\\[31m${ESC}\\[1mERROR: ${ESC}\\[0m"
)

# Ignore various Mac CROSSTOOL-related warnings.
Expand Down
17 changes: 4 additions & 13 deletions tools/workspace/snopt/repository.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,22 +45,13 @@ def snopt_repository(
commit = "0254e961cb8c60193b0862a0428fd6a42bfb5243"
shallow_since = "1546539374 -0500"

# Passing None to the repository rule causes DEBUG output spam from Bazel
# asking us to drop the unused argument, so we'll only pass non-None.
kwargs = dict()
if commit != None:
kwargs.update(commit = commit)
if shallow_since != None:
kwargs.update(shallow_since = shallow_since)
if tag != None:
kwargs.update(tag = tag)
if branch != None:
kwargs.update(branch = branch)

_snopt_repository(
name = name,
remote = remote,
**kwargs
commit = commit,
shallow_since = shallow_since,
tag = tag,
branch = branch,
)

def _setup_git(repo_ctx):
Expand Down