osmith submitted this change.

View Change

Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved
gen_makefile: use args.make_check directly

Change-Id: I3ec4330666254c2b4498381f42e18b66cb17c22a
---
M gen_makefile.py
1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/gen_makefile.py b/gen_makefile.py
index 08d450a..1640735 100755
--- a/gen_makefile.py
+++ b/gen_makefile.py
@@ -309,8 +309,9 @@
assert False, f"unknown buildsystem: {buildsystem}"

def gen_makefile_build(proj, distclean_cond, build_proj, docker_cmd,
- check, src_proj, update_src_copy_cmd):
+ src_proj, update_src_copy_cmd):
buildsystem = projects_buildsystems.get(proj, "autotools")
+ check = "check" if args.make_check else ""

if buildsystem == "autotools":
return f'''
@@ -442,7 +443,7 @@
return src_proj
return os.path.join(make_dir, "src_copy", proj)

-def gen_make(proj, deps, configure_opts, make_dir, src_dir, build_dir, make_check):
+def gen_make(proj, deps, configure_opts, make_dir, src_dir, build_dir):
src_proj = os.path.join(src_dir, proj)
src_proj_copy = gen_src_proj_copy(src_proj, make_dir, proj)

@@ -460,7 +461,6 @@
deps_reinstall = ' '.join(['%s-reinstall' %d for d in deps])
cflags = 'CFLAGS=-g ' if args.build_debug else ''
docker_cmd = f'OSMODEV_PROJECT={proj} {args.docker_cmd} ' if args.docker_cmd else ''
- check = 'check' if make_check else ''
update_src_copy_cmd = gen_update_src_copy_cmd(proj, src_dir, make_dir)

return f'''
@@ -507,7 +507,6 @@
distclean_cond,
build_proj,
docker_cmd,
- check,
src_proj_copy,
update_src_copy_cmd)}

@@ -680,9 +679,7 @@
all_config_opts = []
all_config_opts.extend(configure_opts.get('ALL') or [])
all_config_opts.extend(configure_opts.get(proj) or [])
- content += gen_make(proj, deps, all_config_opts,
- make_dir, src_dir, build_dir,
- args.make_check)
+ content += gen_make(proj, deps, all_config_opts, make_dir, src_dir, build_dir)

# Replace spaces with tabs to avoid the common pitfall of inserting spaces
# instead of tabs by accident into the Makefile (as the python code is indented

To view, visit change 40354. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-MessageType: merged
Gerrit-Project: osmo-dev
Gerrit-Branch: master
Gerrit-Change-Id: I3ec4330666254c2b4498381f42e18b66cb17c22a
Gerrit-Change-Number: 40354
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith@sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de>
Gerrit-Reviewer: osmith <osmith@sysmocom.de>
Gerrit-Reviewer: pespin <pespin@sysmocom.de>