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

Jump to bottom

[TestSuiteBuilder] Updating the test-suite clobber step #75

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[TestSuiteBuilder] Updating the test-suite clobber step #75

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 11 additions & 7 deletions zorg/buildbot/builders/TestSuiteBuilder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ def addTestSuiteStep(
f,
compiler_dir = None,
env = None,
cleanBuildRequested=True,
lit_args = [],
**kwargs):

Expand All @@ -28,13 +29,16 @@ def addTestSuiteStep(
# used for cmake building test-suite step
options = [cc, cxx, cmake_lit_arg]

# always clobber the build directory to test each new compiler
f.addStep(ShellCommand(name='Clean Test Suite Build dir',
command=['rm', '-rf', test_suite_workdir],
haltOnFailure=True,
description='Removing the Test Suite build directory',
workdir=test_suite_base_dir,
env=env))
# The default value of cleanBuildRequested is TRUE as we should always
# clobber the build directory to test each freshly built compiler.
f.addStep(steps.RemoveDirectory(
name='Clean Test Suite Build dir' % test_suite_workdir,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you use Python3 .format() here instead, please?

dir=test_suite_workdir,
haltOnFailure=False,
flunkOnFailure=False,
doStepIf=cleanBuildRequested,
))
Comment on lines +34 to +40
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: Should we keep to the same indentation here as other files? eg .

Suggested change
f.addStep(steps.RemoveDirectory(
name='Clean Test Suite Build dir' % test_suite_workdir,
dir=test_suite_workdir,
haltOnFailure=False,
flunkOnFailure=False,
doStepIf=cleanBuildRequested,
))
f.addStep(steps.RemoveDirectory(name='Clean Test Suite Build dir' % test_suite_workdir,
dir=test_suite_workdir,
haltOnFailure=False,
flunkOnFailure=False,
doStepIf=cleanBuildRequested,
))

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the indenting would probably start under name=, like the other steps.



f.addGetSourcecodeForProject(
project='test-suite',
Expand Down