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.

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

build: remove valgrind from Makefile #9517

Closed
wants to merge 1 commit into from
Closed
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
6 changes: 0 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -125,9 +125,6 @@ test: all
test-parallel: all
$(PYTHON) tools/test.py --mode=release parallel -J

test-valgrind: all
$(PYTHON) tools/test.py --mode=release --valgrind sequential parallel message

test/gc/node_modules/weak/build/Release/weakref.node: $(NODE_EXE)
$(NODE) deps/npm/node_modules/node-gyp/bin/node-gyp rebuild \
--python="$(PYTHON)" \
Expand Down Expand Up @@ -191,9 +188,6 @@ test-build: | all build-addons
test-all: test-build test/gc/node_modules/weak/build/Release/weakref.node
$(PYTHON) tools/test.py --mode=debug,release

test-all-valgrind: test-build
$(PYTHON) tools/test.py --mode=debug,release --valgrind

CI_NATIVE_SUITES := addons
CI_JS_SUITES := doctool inspector known_issues message parallel pseudo-tty sequential

Expand Down
2 changes: 1 addition & 1 deletion test/message/testcfg.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ def __init__(self, path, file, expected, arch, mode, context, config):
self.mode = mode

def IgnoreLine(self, str):
"""Ignore empty lines and valgrind output."""
"""Ignore empty lines"""
if not str.strip(): return True
else: return str.startswith('==') or str.startswith('**')

Expand Down
2 changes: 1 addition & 1 deletion test/pseudo-tty/testcfg.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ def __init__(self, path, file, expected, arch, mode, context, config):
self.mode = mode

def IgnoreLine(self, str):
"""Ignore empty lines and valgrind output."""
"""Ignore empty lines"""
if not str.strip(): return True
else: return str.startswith('==') or str.startswith('**')

Expand Down
1 change: 0 additions & 1 deletion tools/run-valgrind.py

This file was deleted.

8 changes: 0 additions & 8 deletions tools/test.py
Original file line number Diff line number Diff line change
Expand Up @@ -1330,8 +1330,6 @@ def BuildOptions():
default=[], action="append")
result.add_option("--expect-fail", dest="expect_fail",
help="Expect test cases to fail", default=False, action="store_true")
result.add_option("--valgrind", help="Run tests through valgrind",
default=False, action="store_true")
result.add_option("--cat", help="Print the source of the tests",
default=False, action="store_true")
result.add_option("--flaky-tests",
Expand Down Expand Up @@ -1518,12 +1516,6 @@ def Main():
path = SplitPath(arg)
paths.append(path)

# Check for --valgrind option. If enabled, we overwrite the special
# command flag with a command that uses the run-valgrind.py script.
if options.valgrind:
run_valgrind = join(workspace, "tools", "run-valgrind.py")
options.special_command = "python -u " + run_valgrind + " @"

shell = abspath(options.shell)
buildspace = dirname(shell)

Expand Down