Skip to content

Use create_test_opts in more places #795

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

Merged
zware merged 1 commit into from
Sep 16, 2026
+33 −39
Merged

Use create_test_opts in more places #795

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
72 changes: 33 additions & 39 deletions master/custom/factories.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,29 +70,12 @@ def __init__(self, source, *, extra_tags=[], **kwargs):
**getattr(self, "test_environ", {}),
}


##############################################################################
############################### UNIX BUILDS ################################
##############################################################################


def has_option(option, test_options):
# return True for option='-j' and test_options=['-uall', '-j2']
return option in ' '.join(test_options)


class UnixBuild(BaseBuild):
configureFlags = ["--with-pydebug"]
compile_environ = {}
interpreterFlags = ""
testFlags = []
makeTarget = "all"
test_environ = {}
build_out_of_tree = False

def create_test_opts(self, branch, worker):
testopts = [*self.testFlags, *get_j_opts(worker, 2)]
if not has_option("-R", self.testFlags):
if (
not has_option("-R", self.testFlags)
and 'installed' not in self.factory_tags
):
testopts.extend(("--junit-xml", JUNIT_FILENAME))

if {"fedora", "rhel"} & set(worker.tags) and (
Expand Down Expand Up @@ -121,6 +104,26 @@ def create_test_opts(self, branch, worker):

return testopts


##############################################################################
############################### UNIX BUILDS ################################
##############################################################################


def has_option(option, test_options):
# return True for option='-j' and test_options=['-uall', '-j2']
return option in ' '.join(test_options)


class UnixBuild(BaseBuild):
configureFlags = ["--with-pydebug"]
compile_environ = {}
interpreterFlags = ""
testFlags = []
makeTarget = "all"
test_environ = {}
build_out_of_tree = False

def setup(self, branch, worker, test_with_PTY=False, **kwargs):
out_of_tree_dir = "build_oot"

Expand Down Expand Up @@ -227,7 +230,7 @@ class UnixInstalledBuild(BaseBuild):
buildersuffix = ".installed"
configureFlags = []
interpreterFlags = ["-Wdefault", "-bb", "-E"]
defaultTestOpts = ["-rwW", "-uall"]
testFlags = ["-rwW", "-uall"]
makeTarget = "all"
installTarget = "install"
factory_tags = ["installed"]
Expand All @@ -250,16 +253,14 @@ def setup(self, branch, worker, test_with_PTY=False, **kwargs):
j_opts = get_j_opts(worker)
compile = ["make", *j_opts, self.makeTarget]
install = ["make", *j_opts, self.installTarget]
testopts = [
*self.defaultTestOpts,
f"--timeout={self.test_timeout}",
*get_j_opts(worker, 2),
]
testopts = self.create_test_opts(branch, worker)

test = [installed_python,
*self.interpreterFlags,
"-m", "test",
*testopts]
*testopts,
f'--timeout={self.test_timeout}',
]

self.addStep(Compile(command=compile))
self.addStep(Install(command=install))
Expand Down Expand Up @@ -651,11 +652,9 @@ def setup(self, branch, worker, **kwargs):
build_command = self.build_command + self.buildFlags
test_command = [
*self.test_command,
*self.testFlags,
*get_j_opts(worker, 2),
*self.create_test_opts(branch, worker),
*('--timeout', str(self.test_timeout)),
]
if not has_option("-R", self.testFlags):
test_command.extend((r"--junit-xml", JUNIT_FILENAME))
clean_command = [
*self.clean_command,
*self.cleanFlags,
Expand All @@ -668,7 +667,6 @@ def setup(self, branch, worker, **kwargs):
self.addStep(PythonInfo(
command=self.python_command + ["-m", "test.pythoninfo"],
))
test_command.extend(("--timeout", str(self.test_timeout)))
self.addStep(Test(
command=test_command,
timeout=step_timeout(self.test_timeout),
Expand Down Expand Up @@ -870,9 +868,7 @@ def setup(self, branch, worker, test_with_PTY=False, **kwargs):
)
)

testopts = [*self.testFlags, *get_j_opts(worker, 2)]
if not has_option("-R", self.testFlags):
testopts.extend((" --junit-xml", JUNIT_FILENAME))
testopts = self.create_test_opts(branch, worker)

test = [
"make",
Expand Down Expand Up @@ -1038,9 +1034,7 @@ def setup(self, branch, worker, test_with_PTY=False, **kwargs):
)

# Copied from UnixBuild.
testopts = [*self.testFlags, *get_j_opts(worker, 2)]
if not has_option("-R", self.testFlags):
testopts.extend(("--junit-xml", JUNIT_FILENAME))
testopts = self.create_test_opts(branch, worker)
test = [
"make",
"buildbottest",
Expand Down