Skip to content
Open
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
2 changes: 1 addition & 1 deletion ci.py
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ def create_test_list_user(ci_data):
# Check Smatch
test_list.append(ci.CheckSmatch(ci_data, "user", tool_dir="/smatch"))

# Make with Exteranl ELL
# Make with External ELL
test_list.append(ci.MakeExtEll(ci_data))

# Incremental Build
Expand Down
2 changes: 1 addition & 1 deletion ci/buildkernel32.py
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ def post_run(self):

def create_config32(self, orig_config):
"""Create config file for 32bit build
This is a custome step and assume that the orig config file is used
This is a custom step and assume that the orig config file is used
for 64bit. This function createst new config file with CONFIG_64BIT=n
flag and return it.
"""
Expand Down
2 changes: 1 addition & 1 deletion ci/checkallwarning.py
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ def post_run(self):
super().post_run()

def parse_output(self, output):
"""Read output log and creates the dict whcih has key with file path
"""Read output log and creates the dict which has key with file path
and the value is the output log in list
"""

Expand Down
5 changes: 2 additions & 3 deletions ci/checksmatch.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,7 @@ def __init__(self, ci_data, space, tool_dir, kernel_config=None,
self.target = BuildKernel(self.ci_data, kernel_config=kernel_config,
make_params=make_params, dry_run=True)
elif self.space == "user":
config_params = ["--disable-asan", "--disable-lsan",
"--disable-ubsan", "--disable-android"]
config_params = ["--disable-asan", "--disable-lsan", "--disable-ubsan"]
make_params.append(f"CHECK={self.tool_dir}/smatch --full-path")
make_params.append(f"CC={self.tool_dir}/cgcc")
# Set the dry_run=True so it won't submit the result to the pw
Expand Down Expand Up @@ -140,7 +139,7 @@ def post_run(self):
self.target.post_run()

def parse_output(self, output):
"""Read output log and creates the dict whcih has key with file path
"""Read output log and creates the dict which has key with file path
and the value is the output log in list
"""

Expand Down
2 changes: 1 addition & 1 deletion ci/checksparse.py
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ def post_run(self):
super().post_run()

def parse_output(self, output):
"""Read output log and creates the dict whcih has key with file path
"""Read output log and creates the dict which has key with file path
and the value is the output log in list
"""

Expand Down
4 changes: 1 addition & 3 deletions ci/incrementalbuild.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,8 @@ def __init__(self, ci_data, space, kernel_config=None):
self.target = BuildKernel(self.ci_data, kernel_config=kernel_config,
dry_run=True)
elif self.space == "user":
_params = ["--disable-android"]
# Set the dry_run=True so it won't submit the result to the pw.
self.target = BuildBluez(self.ci_data, config_params=_params,
dry_run=True)
self.target = BuildBluez(self.ci_data, dry_run=True)
else:
self.target = None

Expand Down
5 changes: 2 additions & 3 deletions ci/makedistcheck.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,15 @@ class MakeDistcheck(GenericBuild):

def __init__(self, ci_data):
# For dist check, use the following config params
# config: --disable-lsan --disable-asan --disable-ubsan --disable-android
# config: --disable-lsan --disable-asan --disable-ubsan
# For make, use fakeroot

# Common
self.name = "MakeDistcheck"
self.desc = "Run Bluez Make Distcheck"
self.ci_data = ci_data

config_params = ["--disable-lsan", "--disable-asan", "--disable-ubsan",
"--disable-android"]
config_params = ["--disable-lsan", "--disable-asan", "--disable-ubsan"]
make_params = ["distcheck"]
super().__init__(config_params=config_params, make_params=make_params,
use_fakeroot=True, work_dir=ci_data.src_dir)
Expand Down
8 changes: 4 additions & 4 deletions ci/makeextell.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,20 @@

class MakeExtEll(GenericBuild):
"""BlueZ Make with External ELL class
This class builds the BlueZ with exteranl ell option. It assumes that the
This class builds the BlueZ with external ell option. It assumes that the
ELL is already installed on the system
"""

def __init__(self, ci_data):
# To use exteranl ell, use the following config params
# config: --enable-external-ell --disable-lsan --disable-asan --disable-ubsan --disable-android
# To use external ell, use the following config params
# config: --enable-external-ell --disable-lsan --disable-asan --disable-ubsan

# Common
self.name = "bluezmakeextell"
self.desc = "Build Bluez with External ELL"
self.ci_data = ci_data

config_params = ["--enable-external-ell", "--disable-lsan", "--disable-asan", "--disable-ubsan", "--disable-android"]
config_params = ["--enable-external-ell", "--disable-lsan", "--disable-asan", "--disable-ubsan"]
super().__init__(config_params=config_params, work_dir=ci_data.src_dir)

self.log_dbg("Initialization completed")
Expand Down
6 changes: 3 additions & 3 deletions ci/scanbuild.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ def scan_build(self, error_filename):

# Configure the build for base
cmd = ["./bootstrap-configure", "--disable-asan", "--disable-lsan",
"--disable-ubsan", "--disable-android"]
"--disable-ubsan"]
(ret, stdout, stderr) = cmd_run(cmd, cwd=self.ci_data.src_dir)
if ret:
self.log_err("Build config failed")
Expand Down Expand Up @@ -102,13 +102,13 @@ def run(self):
results = self.compare_outputs(base_err_file, patched_err_file)
if results:
# Add warning...
self.log_dbg("Found differnece in two build scans: " + results)
self.log_dbg("Found difference in two build scans: " + results)
submit_pw_check(self.ci_data.pw, self.ci_data.patch_1,
self.name, Verdict.WARNING,
"ScanBuild: " + results,
None, self.ci_data.config['dry_run'])
self.warning(results)
# warning() doens't raise the exception.
# warning() doesn't raise the exception.
raise EndTest

submit_pw_check(self.ci_data.pw, self.ci_data.patch_1,
Expand Down
2 changes: 1 addition & 1 deletion ci/testrunner.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

class TestRunner(Base):
"""Test Runner class
This class runs the test-runner with the test targer
This class runs the test-runner with the test target
"""
def __init__(self, ci_data, test_name, bluez_src_dir):

Expand Down
3 changes: 1 addition & 2 deletions ci/testrunnersetup.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@ def __init__(self, ci_data, bluez_src_dir, tester_config=None):
self.tester_config = "/tester.config"

# BlueZ build object
_params = ["--disable-lsan", "--disable-asan", "--disable-ubsan",
"--disable-android"]
_params = ["--disable-lsan", "--disable-asan", "--disable-ubsan"]
self.bluez_build = BuildBluez(ci_data, config_params=_params,
src_dir=self.bluez_src_dir,
dry_run=True)
Expand Down
8 changes: 4 additions & 4 deletions cleanup_pr.py
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ def update_pull_request(gh, pr, days_created, magic_line):
if days_created >= 7 and days_created < 14:
log_debug("7 <= Days created < 14")
if magic_line == MAGIC_LINE_2 or magic_line == MAGIC_LINE_3:
log_debug(f"Found bot commnet and skip for now: {magic_line}")
log_debug(f"Found bot comment and skip for now: {magic_line}")
else:
if magic_line == MAGIC_LINE:
log_debug("Found 1st comment. Adding the 2nd comment")
Expand Down Expand Up @@ -214,11 +214,11 @@ def manage_pr(gh):
log_info(f"PR is created with Patchwork SID: {pw_sid}")
continue

# Calcuate the number of days since PR was created
# Calculate the number of days since PR was created
delta = datetime.now() - pr.created_at
days_created = delta.days

log_debug(f"PR opended {days_created} days ago")
log_debug(f"PR opened {days_created} days ago")

magic_line = get_latest_comment(gh, pr)

Expand All @@ -231,7 +231,7 @@ def parse_args():
ap = argparse.ArgumentParser(description="Clean up PR")
ap.add_argument('-d', '--dry-run', action='store_true', default=False,
help='Run it without updating the PR')
# Positional paramter
# Positional parameter
ap.add_argument("repo",
help="Name of Github repository. i.e. bluez/bluez")
return ap.parse_args()
Expand Down
4 changes: 2 additions & 2 deletions libs/context.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ def __init__(self, config_file=None, github_repo=None, src_dir=None,
raise ContextError

# Init email
log_info("Initailze EmailTool")
log_info("Initialize EmailTool")
token = None
if 'EMAIL_TOKEN' in os.environ:
token = os.environ['EMAIL_TOKEN']
Expand All @@ -71,7 +71,7 @@ def __init__(self, config_file=None, github_repo=None, src_dir=None,
self.src_dir = self.src_repo.path()
self.patch_root = patch_root

# Custome confguration
# Custom configuration
for kw in kwargs:
log_info(f"Storing {kw}:{kwargs[kw]}")
self.config[kw] = kwargs[kw]
Expand Down
2 changes: 1 addition & 1 deletion sync_patchwork.py
Original file line number Diff line number Diff line change
Expand Up @@ -410,7 +410,7 @@ def parse_args():
ap.add_argument('-p', '--disable-pr', action='store_true', default=False,
help='Disable creating pull request')

# Positional paramter
# Positional parameter
ap.add_argument('space', choices=['user', 'kernel'],
help="user or kernel space")
ap.add_argument("repo",
Expand Down