May 2025 - gerrit-log - lists.osmocom.org

[S] Change in osmo-dev[master]: ruff: add format exclude block

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-dev/+/40349?usp=email ) Change subject: ruff: add format exclude block ...................................................................... ruff: add format exclude block Make it possible to run "ruff format --diff" in CI on tests/test_gen_makefile.py and possibly other files in the future. Related: osmo-ci Ic8ee81f44f71ebb8606e46b3c00332286a89dae9 Change-Id: I681627a3271ec65f356249e930323efc9ce0954d --- M .ruff.toml 1 file changed, 10 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/49/40349/1 diff --git a/.ruff.toml b/.ruff.toml index 64ca401..6c2df50 100644 --- a/.ruff.toml +++ b/.ruff.toml @@ -10,3 +10,13 @@ [lint] # E741: Ambiguous variable name: `l` ignore = ["E741"] + +[format] +exclude = [ + "cgit/osmo-commit-filter.py", + "gen_makefile.py", + "net/fill_config.py", + "net/templates/freeswitch/python/dialplan-dgsm/__init__.py", + "osmo-cn-latest/provision-hlr.py", + "sysmobts-calib.py", +] -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/40349?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I681627a3271ec65f356249e930323efc9ce0954d Gerrit-Change-Number: 40349 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 month

1
0
0 0

[S] Change in osmo-dev[master]: gen_makefile: use more args vars directly

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-dev/+/40353?usp=email ) Change subject: gen_makefile: use more args vars directly ...................................................................... gen_makefile: use more args vars directly Use args.no_ldconfig, args.sudo_ldconfig, args.sudo_make_install directly. Change-Id: I050714163bddeb17351f373ea7dd2ffdfa9a0bb5 --- M gen_makefile.py 1 file changed, 9 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/53/40353/1 diff --git a/gen_makefile.py b/gen_makefile.py index 02ac203..08d450a 100755 --- a/gen_makefile.py +++ b/gen_makefile.py @@ -349,8 +349,10 @@ else: assert False, f"unknown buildsystem: {buildsystem}" -def gen_makefile_install(proj, docker_cmd, sudo_make_install, build_proj, - no_ldconfig, sudo_ldconfig): +def gen_makefile_install(proj, docker_cmd, build_proj): + no_ldconfig = '#' if args.no_ldconfig else '' + sudo_ldconfig = '' if args.ldconfig_without_sudo else 'sudo ' + sudo_make_install = "sudo " if args.sudo_make_install else "" buildsystem = projects_buildsystems.get(proj, "autotools") if buildsystem == "autotools": return f''' @@ -383,8 +385,8 @@ else: assert False, f"unknown buildsystem: {buildsystem}" -def gen_makefile_reinstall(proj, deps_reinstall, sudo_make_install, - build_proj): +def gen_makefile_reinstall(proj, deps_reinstall, build_proj): + sudo_make_install = "sudo " if args.sudo_make_install else "" return f''' .PHONY: {proj}-reinstall {proj}-reinstall: {deps_reinstall} @@ -440,7 +442,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, sudo_make_install, no_ldconfig, ldconfig_without_sudo, make_check): +def gen_make(proj, deps, configure_opts, make_dir, src_dir, build_dir, make_check): src_proj = os.path.join(src_dir, proj) src_proj_copy = gen_src_proj_copy(src_proj, make_dir, proj) @@ -459,9 +461,6 @@ 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 '' - no_ldconfig = '#' if no_ldconfig else '' - sudo_ldconfig = '' if ldconfig_without_sudo else 'sudo ' - sudo_make_install = 'sudo ' if sudo_make_install else '' update_src_copy_cmd = gen_update_src_copy_cmd(proj, src_dir, make_dir) return f''' @@ -514,14 +513,10 @@ {gen_makefile_install(proj, docker_cmd, - sudo_make_install, - build_proj, - no_ldconfig, - sudo_ldconfig)} + build_proj)} {gen_makefile_reinstall(proj, deps_reinstall, - sudo_make_install, build_proj)} {gen_makefile_clean(proj, build_proj)} @@ -687,8 +682,7 @@ all_config_opts.extend(configure_opts.get(proj) or []) content += gen_make(proj, deps, all_config_opts, make_dir, src_dir, build_dir, - args.sudo_make_install, args.no_ldconfig, - args.ldconfig_without_sudo, args.make_check) + args.make_check) # 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 https://gerrit.osmocom.org/c/osmo-dev/+/40353?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I050714163bddeb17351f373ea7dd2ffdfa9a0bb5 Gerrit-Change-Number: 40353 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 month

1
0
0 0

[S] Change in osmo-dev[master]: gen_makefile: use args.make_check directly

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-dev/+/40354?usp=email ) Change subject: gen_makefile: use args.make_check directly ...................................................................... gen_makefile: use args.make_check directly Change-Id: I3ec4330666254c2b4498381f42e18b66cb17c22a --- M gen_makefile.py 1 file changed, 4 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/54/40354/1 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 https://gerrit.osmocom.org/c/osmo-dev/+/40354?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I3ec4330666254c2b4498381f42e18b66cb17c22a Gerrit-Change-Number: 40354 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 month

1
0
0 0

[S] Change in osmo-dev[master]: gen_makefile: remove --auto-distclean parameter

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-dev/+/40355?usp=email ) Change subject: gen_makefile: remove --auto-distclean parameter ...................................................................... gen_makefile: remove --auto-distclean parameter The purpose of this parameter was to run "make distclean" automatically if a source directory was already configured for an in-tree build. osmo-dev always does out-of-tree builds and so ./configure complains: configure: error: source directory already configured; run "make distclean" there first --auto-distclean worked most of the time, but not always. The --autoreconf-in-src-copy (-A) parameter makes this obsolete as it solves the same problem but with a better method. When -A is set, autoreconf and configure run in a copy of the source directory which avoids all conflicts with an in-tree build in the original source directory without the need to remove artifacts from the in-tree build. This has been in use by testenv in osmo-ttcn3-hacks for a while and is working reliably. Change-Id: I28378e6d2cafd209adcfae6b85a032d73ed14cce --- M gen_makefile.py 1 file changed, 3 insertions(+), 25 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/55/40355/1 diff --git a/gen_makefile.py b/gen_makefile.py index 1640735..80ecfa0 100755 --- a/gen_makefile.py +++ b/gen_makefile.py @@ -116,9 +116,6 @@ parser.add_argument('-g', '--build-debug', dest='build_debug', default=False, action='store_true', help='''set 'CFLAGS=-g' when calling src/configure''') -parser.add_argument('-a', '--auto-distclean', action='store_true', - help='''run "make distclean" automatically if source directory already configured''') - parser.add_argument('-i', '--install-prefix', default='/usr/local', help='''install there instead of /usr/local''') @@ -252,13 +249,12 @@ touch $@ ''' -def gen_makefile_autoconf(proj, src_proj, src_proj_copy, distclean_cond, update_src_copy_cmd): +def gen_makefile_autoconf(proj, src_proj, src_proj_copy, update_src_copy_cmd): buildsystem = projects_buildsystems.get(proj, "autotools") if buildsystem == "autotools": return f''' .make.{proj}.autoconf: .make.{proj}.clone {src_proj}/configure.ac - if {distclean_cond}; then $(MAKE) {proj}-distclean; fi @echo "\\n\\n\\n===== $@\\n" {update_src_copy_cmd} -rm -f {src_proj_copy}/.version @@ -272,14 +268,13 @@ assert False, f"unknown buildsystem: {buildsystem}" -def gen_makefile_configure(proj, deps_installed, distclean_cond, build_proj, +def gen_makefile_configure(proj, deps_installed, build_proj, cflags, docker_cmd, build_to_src, configure_opts, update_src_copy_cmd): buildsystem = projects_buildsystems.get(proj, "autotools") if buildsystem == "autotools": return f''' .make.{proj}.configure: .make.{proj}.autoconf {deps_installed} $({proj}_configure_files) - if {distclean_cond}; then $(MAKE) {proj}-distclean .make.{proj}.autoconf; fi @echo "\\n\\n\\n===== $@\\n" {update_src_copy_cmd} -chmod -R ug+w {build_proj} @@ -308,7 +303,7 @@ else: assert False, f"unknown buildsystem: {buildsystem}" -def gen_makefile_build(proj, distclean_cond, build_proj, docker_cmd, +def gen_makefile_build(proj, build_proj, docker_cmd, src_proj, update_src_copy_cmd): buildsystem = projects_buildsystems.get(proj, "autotools") check = "check" if args.make_check else "" @@ -316,7 +311,6 @@ if buildsystem == "autotools": return f''' .make.{proj}.build: .make.{proj}.configure $({proj}_files) - if {distclean_cond}; then $(MAKE) {proj}-distclean .make.{proj}.configure; fi @echo "\\n\\n\\n===== $@\\n" {update_src_copy_cmd} {docker_cmd}$(MAKE) -C {build_proj} -j {args.jobs} {check} @@ -404,14 +398,6 @@ -rm -rf .make.{proj}.* ''' -def gen_makefile_distclean(proj, src_proj): - return f''' -.PHONY: {proj}-distclean -{proj}-distclean: {proj}-clean - @echo "\\n\\n\\n===== $@\\n" - $(MAKE) -C {src_proj} distclean - ''' - def is_src_copy_needed(proj): if not args.autoreconf_in_src_copy: return False @@ -456,7 +442,6 @@ else: configure_opts_str = '' - distclean_cond = f'[ -e {src_proj}/config.status ]' if args.auto_distclean else 'false' deps_installed = ' '.join(['.make.%s.install' % d for d in deps]) deps_reinstall = ' '.join(['%s-reinstall' %d for d in deps]) cflags = 'CFLAGS=-g ' if args.build_debug else '' @@ -490,12 +475,10 @@ {gen_makefile_autoconf(proj, src_proj, src_proj_copy, - distclean_cond, update_src_copy_cmd)} {gen_makefile_configure(proj, deps_installed, - distclean_cond, build_proj, cflags, docker_cmd, @@ -504,7 +487,6 @@ update_src_copy_cmd)} {gen_makefile_build(proj, - distclean_cond, build_proj, docker_cmd, src_proj_copy, @@ -520,8 +502,6 @@ {gen_makefile_clean(proj, build_proj)} -{gen_makefile_distclean(proj, src_proj)} - .PHONY: {proj} {proj}: .make.{proj}.install ''' @@ -649,8 +629,6 @@ content += f" --push-url {shlex.quote(args.docker_cmd)} \\\n" if args.build_debug: content += " --build-debug \\\n" -if args.auto_distclean: - content += " --auto-distclean \\\n" if args.autoreconf_in_src_copy: content += " --autoreconf-in-src-copy \\\n" content += " $(NULL)\n" -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/40355?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I28378e6d2cafd209adcfae6b85a032d73ed14cce Gerrit-Change-Number: 40355 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 month

1
0
0 0

[S] Change in osmo-dev[master]: gen_makefile: remove --docker-cmd

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-dev/+/40357?usp=email ) Change subject: gen_makefile: remove --docker-cmd ...................................................................... gen_makefile: remove --docker-cmd This was only used by ttcn3.sh, which has been removed in the previous commit. Change-Id: I3b2460ad9c93516d010866fda3a21c0b56baa383 --- M gen_makefile.py 1 file changed, 10 insertions(+), 20 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/57/40357/1 diff --git a/gen_makefile.py b/gen_makefile.py index 80ecfa0..a118392 100755 --- a/gen_makefile.py +++ b/gen_makefile.py @@ -110,9 +110,6 @@ default=True, action='store_false', help='''do not 'make check', just 'make' to build.''') -parser.add_argument('--docker-cmd', - help='''prefix configure/make/make install calls with this command (used by ttcn3.sh)''') - parser.add_argument('-g', '--build-debug', dest='build_debug', default=False, action='store_true', help='''set 'CFLAGS=-g' when calling src/configure''') @@ -269,7 +266,7 @@ def gen_makefile_configure(proj, deps_installed, build_proj, - cflags, docker_cmd, build_to_src, configure_opts, + cflags, build_to_src, configure_opts, update_src_copy_cmd): buildsystem = projects_buildsystems.get(proj, "autotools") if buildsystem == "autotools": @@ -280,7 +277,7 @@ -chmod -R ug+w {build_proj} -rm -rf {build_proj} mkdir -p {build_proj} - cd {build_proj}; {cflags}{docker_cmd}{build_to_src}/configure \\ + cd {build_proj}; {cflags}{build_to_src}/configure \\ --prefix {shlex.quote(args.install_prefix)} \\ {configure_opts} sync @@ -293,7 +290,7 @@ -chmod -R ug+w {build_proj} -rm -rf {build_proj} mkdir -p {build_proj} - cd {build_proj}; {cflags}{docker_cmd}meson setup {build_to_src} . \\ + cd {build_proj}; {cflags}meson setup {build_to_src} . \\ --prefix {shlex.quote(args.install_prefix)} sync touch $@ @@ -303,8 +300,7 @@ else: assert False, f"unknown buildsystem: {buildsystem}" -def gen_makefile_build(proj, build_proj, docker_cmd, - src_proj, update_src_copy_cmd): +def gen_makefile_build(proj, build_proj, src_proj, update_src_copy_cmd): buildsystem = projects_buildsystems.get(proj, "autotools") check = "check" if args.make_check else "" @@ -313,7 +309,7 @@ .make.{proj}.build: .make.{proj}.configure $({proj}_files) @echo "\\n\\n\\n===== $@\\n" {update_src_copy_cmd} - {docker_cmd}$(MAKE) -C {build_proj} -j {args.jobs} {check} + $(MAKE) -C {build_proj} -j {args.jobs} {check} sync touch $@ ''' @@ -321,11 +317,11 @@ test_line = "" # TODO: currently tests don't pass in this env # if check: - # test_line = f"{docker_cmd}meson test -C {build_proj} -v" + # test_line = f"meson test -C {build_proj} -v" return f''' .make.{proj}.build: .make.{proj}.configure $({proj}_files) @echo "\\n\\n\\n===== $@\\n" - {docker_cmd}meson compile -C {build_proj} -j {args.jobs} + meson compile -C {build_proj} -j {args.jobs} {test_line} sync touch $@ @@ -344,7 +340,7 @@ else: assert False, f"unknown buildsystem: {buildsystem}" -def gen_makefile_install(proj, docker_cmd, build_proj): +def gen_makefile_install(proj, build_proj): no_ldconfig = '#' if args.no_ldconfig else '' sudo_ldconfig = '' if args.ldconfig_without_sudo else 'sudo ' sudo_make_install = "sudo " if args.sudo_make_install else "" @@ -353,7 +349,7 @@ return f''' .make.{proj}.install: .make.{proj}.build @echo "\\n\\n\\n===== $@\\n" - {docker_cmd}{sudo_make_install}$(MAKE) -C {build_proj} install + {sudo_make_install}$(MAKE) -C {build_proj} install {no_ldconfig}{sudo_ldconfig}ldconfig sync touch $@ @@ -362,7 +358,7 @@ return f''' .make.{proj}.install: .make.{proj}.build @echo "\\n\\n\\n===== $@\\n" - {docker_cmd}{sudo_make_install}ninja -C {build_proj} install + {sudo_make_install}ninja -C {build_proj} install {no_ldconfig}{sudo_ldconfig}ldconfig sync touch $@ @@ -445,7 +441,6 @@ deps_installed = ' '.join(['.make.%s.install' % d for d in deps]) 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 '' update_src_copy_cmd = gen_update_src_copy_cmd(proj, src_dir, make_dir) return f''' @@ -481,19 +476,16 @@ deps_installed, build_proj, cflags, - docker_cmd, build_to_src, configure_opts_str, update_src_copy_cmd)} {gen_makefile_build(proj, build_proj, - docker_cmd, src_proj_copy, update_src_copy_cmd)} {gen_makefile_install(proj, - docker_cmd, build_proj)} {gen_makefile_reinstall(proj, @@ -625,8 +617,6 @@ content += " --ldconfig-without-sudo \\\n" if not args.make_check: content += " --no-make-check \\\n" -if args.docker_cmd: - content += f" --push-url {shlex.quote(args.docker_cmd)} \\\n" if args.build_debug: content += " --build-debug \\\n" if args.autoreconf_in_src_copy: -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/40357?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I3b2460ad9c93516d010866fda3a21c0b56baa383 Gerrit-Change-Number: 40357 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 month

1
0
0 0

[L] Change in osmo-dev[master]: Remove old ttcn3.sh + related files

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-dev/+/40356?usp=email ) Change subject: Remove old ttcn3.sh + related files ...................................................................... Remove old ttcn3.sh + related files Remove the precursor to testenv in osmo-ttcn3-hacks. This script worked by building docker containers from docker-playground, and then building Osmocom components and osmo-ttcn3-hacks testsuites again from source and mounting them inside the containers. With testenv there is only one container, it is possible to switch between building from source with osmo-dev and using binary packages, etc. Removing this allows removing --docker-cmd from gen_makefile.py which were only used by ttcn3.sh. This will make maintaining gen_makefile.py easier. Related: OS#6494 Change-Id: I5c53dadd24786240eaaca6d487bac02538556ebe --- M README D ttcn3/scripts/docker_configure_make.sh D ttcn3/ttcn3.opts D ttcn3/ttcn3.sh 4 files changed, 0 insertions(+), 657 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/56/40356/1 diff --git a/README b/README index d20499c..e425c8e 100644 --- a/README +++ b/README @@ -141,37 +141,6 @@ Find other useful scripts in src/, see src/README. - -=== ttcn3/ttcn3.sh - -Run a given testsuite with docker, so it behaves exactly the same as when -jenkins runs it [1], but use osmo-dev to build all related Osmocom components -and the testsuite, and mount them inside the docker containers. After building -the docker containers for the first time (which takes rather long), this gives -short test cycles: just modify something, run the script again and the relevant -objects will be built directly, already built objects do not need to be -rebuilt. (This is a big speed improvement over just using docker containers as -you don't need to push your sources to a git server first, have the docker -containers fetch the git sources and build the modified component from scratch -again.) - -The docker containers are used, so we don't have to maintain a second set of -configs which works without docker (that was tried before, and found not to be -feasible). - -Example usage: - - ./ttcn3/ttcn3.sh mgw - IMAGE_SUFFIX=latest ./ttcn3/ttcn3.sh mgw - -More about the testsuites: -https://osmocom.org/projects/cellular-infrastructure/wiki/Titan_TTCN3_Testsuites - -Video explaining this script, related approaches and osmo-dev in general: -https://media.ccc.de/v/osmodevcall-20211210-osmith-osmo-dev-ttcn3 - -[1] https://jenkins.osmocom.org/jenkins/view/TTCN3/ - === ttcn3/tmux It's possible to run TTCN-3 test cases without using Docker. This directory diff --git a/ttcn3/scripts/docker_configure_make.sh b/ttcn3/scripts/docker_configure_make.sh deleted file mode 100755 index e6857fd..0000000 --- a/ttcn3/scripts/docker_configure_make.sh +++ /dev/null @@ -1,89 +0,0 @@ -#!/bin/sh -ex -# Passed by ttcn3.sh to gen_makefile.py to run './configure', 'make' and -# 'make install' inside docker. The osmo-dev directory is mounted at the same -# location inside the docker container. A usr_local dir is mounted to -# /usr/local, so 'make install' can put all files there and following builds -# have the files available. -# env vars: OSMODEV_PROJECT -DIR_OSMODEV="$(readlink -f "$(dirname $0)/../..")" -DIR_MAKE="$DIR_OSMODEV/ttcn3/make" -DIR_USR_LOCAL="$DIR_OSMODEV/ttcn3/usr_local" -DIR_VAR_LOCAL="$DIR_OSMODEV/ttcn3/var_local" -DIR_CCACHE="$DIR_OSMODEV/ttcn3/ccache/osmocom-programs" -RUN_SCRIPT="$DIR_OSMODEV/ttcn3/.run.sh" -UID="$(id -u)" - -# Osmocom libraries and programs relevant for the current testsuite will be -# built in this container. It must have all build dependencies available and -# be based on the same distribution that master-* containers are based on, so -# there are no incompatibilities with shared libraries. -DOCKER_IMG_BUILD="debian-bookworm-build" -DOCKER_IMG_BUILD_OGS="open5gs-master" - -docker_image_exists() { - test -n "$(docker images -q "$1")" -} - -build_docker_img() { - local img="$1" - local dp="${DIR_OSMODEV}/src/docker-playground" - - if ! docker_image_exists "$USER/$img"; then - echo "Building docker image: $USER/$img" - make -C "$dp/$img" - fi -} - -build_docker_imgs() { - build_docker_img "$DOCKER_IMG_BUILD" - - if [ "$OSMODEV_PROJECT" = "open5gs" ]; then - build_docker_img "$DOCKER_IMG_BUILD_OGS" - fi -} - -set_docker_img_var() { - case "$OSMODEV_PROJECT" in - open5gs) - DOCKER_IMG="$USER/$DOCKER_IMG_BUILD_OGS" - ;; - *) - DOCKER_IMG="$USER/$DOCKER_IMG_BUILD" - ;; - esac -} - -mkdir -p \ - "$DIR_MAKE" \ - "$DIR_CCACHE" \ - "$DIR_USR_LOCAL" \ - "$DIR_VAR_LOCAL" - -# Script running as user inside docker -echo "#!/bin/sh -ex" > "$RUN_SCRIPT" -echo "cd \"$PWD\"" >> "$RUN_SCRIPT" -for i in "$@"; do - echo -n "'$i' " >> "$RUN_SCRIPT" -done -echo >> "$RUN_SCRIPT" -chmod +x "$RUN_SCRIPT" - -build_docker_imgs -set_docker_img_var - -docker run \ - --rm \ - -t \ - -e "LD_LIBRARY_PATH=/usr/local/lib" \ - -v "$DIR_OSMODEV:$DIR_OSMODEV" \ - -v "$DIR_USR_LOCAL:/usr/local" \ - -v "$DIR_VAR_LOCAL:/var/local" \ - -v "$RUN_SCRIPT:/tmp/run.sh:ro" \ - -v "$DIR_CCACHE:/home/build/.ccache" \ - "$DOCKER_IMG" \ - sh -ex -c " - if ! id -u $UID 2>/dev/null; then - useradd -u $UID user - fi - su \$(id -un $UID) -c /tmp/run.sh - " diff --git a/ttcn3/ttcn3.opts b/ttcn3/ttcn3.opts deleted file mode 100644 index 7949d16..0000000 --- a/ttcn3/ttcn3.opts +++ /dev/null @@ -1,4 +0,0 @@ -osmo-bts --enable-trx - -# Find the ccache wrapper in /usr/lib/ccache and /usr/lib/ccache/bin -ALL CC="$(find /usr/lib/ccache -name gcc | head -n1)" CXX="$(find /usr/lib/ccache -name g++ | head -n1)" diff --git a/ttcn3/ttcn3.sh b/ttcn3/ttcn3.sh deleted file mode 100755 index 4b6392b..0000000 --- a/ttcn3/ttcn3.sh +++ /dev/null @@ -1,533 +0,0 @@ -#!/bin/sh -e -PROJECT="" -PROJECT_UPPER="" -DIR_OSMODEV="$(readlink -f "$(dirname $0)/..")" -DIR_MAKE="${DIR_MAKE:-${DIR_OSMODEV}/ttcn3/make}" -DIR_OUTPUT="${DIR_OUTPUT:-${DIR_OSMODEV}/ttcn3/out}" -DIR_USR_LOCAL="$DIR_OSMODEV/ttcn3/usr_local" -DIR_VAR_LOCAL="$DIR_OSMODEV/ttcn3/var_local" -JOBS="$(nproc)" -KERNEL_DIR="" -KERNEL_SKIP_MARKER="$DIR_MAKE/.kernel_built_from_source" -ARG_TEST_NAME="" -ARG_TEST_CONFIGS="" -DOCKER_IMG_TITAN="debian-bookworm-titan" - -clean() { - if [ "$1" != "clean" ]; then - return - fi - if [ "$#" != 1 ]; then - parse_args -h - fi - - set -x - rm -rf \ - "$DIR_MAKE" \ - "$DIR_OUTPUT" \ - "$DIR_USR_LOCAL" \ - "$DIR_VAR_LOCAL" - - if [ -d "$DIR_OSMODEV/src/osmo-ttcn3-hacks" ]; then - sudo chown -R "$(id -u):$(id -g)" \ - "$DIR_OSMODEV/src/osmo-ttcn3-hacks" - make -C "$DIR_OSMODEV/src/osmo-ttcn3-hacks" clean - fi - - exit 0 -} - -set_project() { - PROJECT="$1" - PROJECT_UPPER="$(echo "$PROJECT" | tr '[:lower:]' '[:upper:]')" - PROJECT_NO_OGS="$(echo "$PROJECT" | sed 's/-ogs$//')" -} - -parse_args() { - while getopts 'ht:c:dkf' OPTION; do - case "$OPTION" in - t) - ARG_TEST_NAME="$OPTARG" - ;; - c) - ARG_TEST_CONFIGS="$OPTARG" - ;; - d) - if [ -n "$KERNEL_TEST" ]; then - echo "ERROR: use either -d or -k" - exit 1 - fi - export KERNEL_TEST=1 - ;; - k) - if [ -n "$KERNEL_TEST" ]; then - echo "ERROR: use either -d or -k" - exit 1 - fi - if [ -z "$KERNEL_DIR" ]; then - KERNEL_DIR="$(realpath "$DIR_OSMODEV/../linux")" - fi - if ! [ -e "$KERNEL_DIR/Kbuild" ]; then - echo "ERROR: KERNEL_DIR is invalid: $KERNEL_DIR" - exit 1 - fi - - export KERNEL_TEST=1 - export KERNEL_BUILD=1 - export KERNEL_SKIP_REBUILD=1 - ;; - f) - if [ -z "$KERNEL_BUILD" ]; then - echo "ERROR: don't use -f without -k" - exit 1 - fi - rm -f "$KERNEL_SKIP_MARKER" - ;; - h|*) - local name="$(basename $0)" - echo "usage: $name [-h] [-t TESTNAME] [-c CONFIG] [-d|-k [-f]] PROJECT" - echo " or: $name clean" - echo - echo "arguments:" - echo " -h show help" - echo " -t only run the test with this name" - echo " -c only run test configuration with this name" - echo - echo "arguments for kernel tests:" - echo " -d run kernel tests with debian kernel" - echo " -k run kernel tests with kernel built from source" - echo " -f (use with -k) don't skip build if kernel already exists" - echo - echo " PROJECT the testsuite project to run" - echo - echo "examples:" - echo " $name bsc" - echo " $name bsc-sccplite" - echo " $name -t TC_gsup_check_imei hlr" - echo " $name -d ggsn" - echo " $name -k ggsn" - echo " $name -k -f ggsn" - echo " $name ggsn-ogs" - echo " $name hss" - echo " $name mme" - echo " $name pgw" - echo " $name -t TC_est_dchan -c generic bts" - exit 1 - ;; - esac - done - shift "$(($OPTIND - 1))" - - if [ "$#" != "1" ]; then - parse_args -h - fi - - set_project "$1" - if ! [ -d "$(get_testsuite_dir_docker)" ]; then - set_project "$1-ogs" - if ! [ -d "$(get_testsuite_dir_docker)" ]; then - echo "ERROR: can't find testsuite_dir, adjust" \ - "get_testsuite_dir_docker" - fi - fi - - echo "PROJECT: $PROJECT" -} - -check_usage() { - if [ -z "$PROJECT" ]; then - parse_args -h - fi -} - -get_testsuite_dir() { - local hacks="${DIR_OSMODEV}/src/osmo-ttcn3-hacks" - - case "$PROJECT" in - bsc-*) echo "$hacks/bsc" ;; - bts-*) echo "$hacks/bts" ;; - ggsn|ggsn-ogs) echo "$hacks/ggsn_tests" ;; - pcu-sns) echo "$hacks/pcu" ;; - *) echo "$hacks/$PROJECT_NO_OGS" ;; - esac -} - -get_testsuite_dir_docker() { - local dp="${DIR_OSMODEV}/src/docker-playground" - - case "$PROJECT" in - bsc-*) - echo "$dp/ttcn3-bsc-test-$(echo "$PROJECT" | cut -d - -f 2-)" - ;; - *-ogs) - echo "$dp/ttcn3-$PROJECT_NO_OGS-test-ogs" - ;; - *) - echo "$dp/ttcn3-$PROJECT-test" - ;; - esac -} - -get_testsuite_image() { - case "$PROJECT" in - bsc-*) - echo "$USER/ttcn3-bsc-test" - ;; - ggsn-ogs) - echo "$USER/ttcn3-ggsn-test" - ;; - *-ogs) - echo "$USER/ttcn3-$PROJECT_NO_OGS-test-ogs" - ;; - *) - echo "$USER/ttcn3-$PROJECT-test" - ;; - esac -} - -# Dependencies not mentioned in all.deps -get_extra_libraries() { - case "$PROJECT" in - ggsn) echo "libgtpnl" ;; # needed for --enable-gtp-linux - esac -} - -# Programs that need to be built -get_programs() { - case "$PROJECT" in - # Open5gs - *-ogs) echo "open5gs" ;; - pgw) echo "open5gs osmo-uecups-daemon" ;; - - # Osmocom - bsc|bsc-*) echo "osmo-stp osmo-bsc osmo-bts-omldummy" ;; - bts) echo "osmo-bsc osmo-bts-trx trxcon" ;; - msc) echo "osmo-stp osmo-msc" ;; - pcu-sns) echo "osmo-pcu" ;; - pcu) echo "osmo-pcu osmo-bsc osmo-bts-virtual" ;; - sgsn) echo "osmo-stp osmo-sgsn" ;; - sip) echo "osmo-sip-connector" ;; - *) echo "osmo-$PROJECT" ;; - esac -} - -# Return the git repository name, which has the source for a specific program. -# $1: program name -get_program_repo() { - case "$1" in - osmo-bts-*) echo "osmo-bts" ;; - osmo-pcap-*) echo "osmo-pcap" ;; - osmo-stp) echo "libosmo-sigtran" ;; - osmo-uecups-*) echo "osmo-uecups" ;; - trxcon) echo "osmocom-bb_trxcon" ;; - *) echo "$1" ;; - esac -} - -check_ttcn3_install() { - if ! command -v ttcn3_compiler > /dev/null; then - echo "ERROR: ttcn3_compiler is not installed." - echo "Install eclipse-titan from the Osmocom latest repository." - echo "Details: https://osmocom.org/projects/cellular-infrastructure/wiki/Titan_TTCN3_Tests…" - exit 1 - fi -} - -setup_dir_make() { - cd "$DIR_OSMODEV" - - local docker_cmd="$DIR_OSMODEV/ttcn3/scripts/docker_configure_make.sh" - - ./gen_makefile.py \ - default.opts \ - gtp_linux.opts \ - iu.opts \ - no_dahdi.opts \ - no_doxygen.opts \ - no_optimization.opts \ - no_systemd.opts \ - ttcn3/ttcn3.opts \ - werror.opts \ - --docker-cmd "$docker_cmd" \ - --make-dir "$DIR_MAKE" \ - --no-ldconfig \ - --no-make-check \ - --auto-distclean -} - -# $1: name of repository (e.g. osmo-ttcn3-hacks) -clone_repo() { - if ! [ -e "$DIR_OSMODEV/ttcn3/make/.make.${1}.clone" ]; then - make -C "$DIR_MAKE" ".make.${1}.clone" - fi -} - -# Require testsuite dir and docker-playground dir -check_dir_testsuite() { - local program - local config_testsuite - local dir_testsuite="$(get_testsuite_dir)" - local dir_testsuite_docker="$(get_testsuite_dir_docker)" - - if ! [ -d "$dir_testsuite" ]; then - echo "ERROR: project '$PROJECT' is invalid, resulting path not found: $dir_testsuite" - exit 1 - fi - - if ! [ -d "$dir_testsuite_docker" ]; then - echo "ERROR: could not find docker dir for project: $PROJECT: $dir_testsuite_docker" - echo "Adjust get_testsuite_dir_docker?" - exit 1 - fi - - # Sanity check for jenkins.sh - if ! grep -q DOCKER_ARGS $dir_testsuite_docker/jenkins.sh; then - echo "ERROR: DOCKER_ARGS not found in $dir_testsuite_docker/jenkins.sh!" - exit 1 - fi -} - -# Copy scripts from docker-playground to /usr/local/bin, so we don't miss them when mounting the outside /usr/local/bin -# inside the docker container -prepare_local_bin() { - local scripts=" - ${DIR_OSMODEV}/src/docker-playground/common/respawn.sh - ${DIR_OSMODEV}/src/docker-playground/common/ttcn3-docker-run.sh - " - - for script in $scripts; do - local script_path_localbin - local name_install="$(basename "$script")" - - case "$name_install" in - ttcn3-docker-run.sh) name_install="ttcn3-docker-run" ;; - esac - - script_path_localbin="$DIR_USR_LOCAL/bin/$name_install" - - install -v -Dm755 "$script" "$script_path_localbin" - done -} - -prepare_docker_testsuite_container() { - local testsuite_image="$(get_testsuite_image)" - - if docker_image_exists "$testsuite_image"; then - return - fi - - if ! docker_image_exists "$USER/$DOCKER_IMG_TITAN"; then - echo "Building docker image: $USER/$DOCKER_IMG_TITAN" - local dp="${DIR_OSMODEV}/src/docker-playground" - make -C "$dp/$DOCKER_IMG_TITAN" - fi - - echo "Building docker image: $testsuite_image" - local testsuite_dir="$(get_testsuite_dir_docker)" - make -C "$testsuite_dir" -} - -# Use osmo-dev to build libraries not mentioned in all.deps, for example the -# libgtpnl dependency of osmo-ggsn that is only needed with --enable-gtp-linux. -build_extra_libraries() { - local library - local libraries="$(get_extra_libraries)" - - for library in $libraries; do - set -x - make -C "$DIR_MAKE" "$library" - set +x - done -} - -# Use osmo-dev to build one Osmocom program and its dependencies -build_osmo_programs() { - local program - local programs="$(get_programs)" - local make_args="-C $DIR_MAKE" - - for program in $programs; do - local repo="$(get_program_repo "$program")" - make_args="$make_args $repo" - done - - set -x - make $make_args - set +x - - for program in $programs; do - if [ "$program" = "open5gs" ]; then - # open5gs binaries have different names (open5gs-mmed, - # etc.) - continue - fi - - local repo="$(get_program_repo "$program")" - local usr_local_bin="$DIR_USR_LOCAL/bin" - - if [ -z "$(find "$usr_local_bin" -name "$program")" ]; then - echo "ERROR: program was not installed properly: $program" - echo "Expected it to be in path: $PATH_dest" - exit 1 - fi - - local reference="$DIR_MAKE/.make.$repo.build" - if [ -z "$(find "$usr_local_bin" -name "$program" -newer "$reference")" ]; then - echo "ERROR: $path is outdated!" - echo "Maybe you need to pass a configure argument to $repo.git, so it builds and installs" \ - "$program?" - exit 1 - fi - done -} - -docker_image_exists() { - test -n "$(docker images -q "$1")" -} - -build_testsuite() { - cd "$(get_testsuite_dir)" - - local deps_marker="${DIR_OSMODEV}/ttcn3/make/.ttcn3-deps" - if ! [ -e "$deps_marker" ]; then - make -C "${DIR_OSMODEV}/src/osmo-ttcn3-hacks/deps" -j"$JOBS" - touch "$deps_marker" - fi - - # Build inside docker, so the resulting binary links against the - # libraries available in docker and not the ones from the host system, - # since we will run it inside docker later too. - local hacks="${DIR_OSMODEV}/src/osmo-ttcn3-hacks" - - local testsuite_image="$(get_testsuite_image)" - echo "testsuite_image: $testsuite_image" - - mkdir -p "$"$DIR_OSMODEV/ttcn3/ccache/ttcn3 - - # -t: add a tty, so we get color output from the compiler - docker run \ - --rm \ - -t \ - -v "$hacks:/osmo-ttcn3-hacks" \ - -v "$DIR_OSMODEV/ttcn3/ccache/ttcn3:/root/.ccache" \ - "$testsuite_image" \ - sh -exc " - cd /osmo-ttcn3-hacks/$(basename "$(get_testsuite_dir)"); - ./gen_links.sh; - USE_CCACHE=1 ./regen_makefile.sh; - make compile; - make -j"$JOBS" - " -} - -# Similar to update_kernel_config in docker-playground -# scripts/kernel-test/kernel-build.sh -update_kernel_config() { - local previous="$DIR_MAKE/.kernel.previous.config" - local fragment="$(get_testsuite_dir_docker)/fragment.config" - - set -x - make defconfig - scripts/kconfig/merge_config.sh -m .config "$fragment" - make olddefconfig - set +x - - if [ -e "$previous" ] && ! diff -q "$previous" .config; then - # Remove everything built with previous config - echo "Kernel config changed, running 'make clean'" - make clean - fi - - cp .config "$previous" -} - -build_kernel() { - local image="arch/x86/boot/bzImage" - - if [ -z "$KERNEL_DIR" ]; then - return - fi - - cd "$KERNEL_DIR" - if ! [ -e "$image" ]; then - rm -f "$KERNEL_SKIP_MARKER" - fi - if ! [ -e "$KERNEL_SKIP_MARKER" ]; then - update_kernel_config - make -j"$JOBS" - fi - - # Copy the kernel to the path expected by - # docker-playground scripts/kernel-test/kernel-build.sh - local dest="$DIR_OSMODEV/src/docker-playground/_cache/linux/$image" - mkdir -p "$(dirname "$dest")" - cp "$image" "$dest" - - touch "$KERNEL_SKIP_MARKER" -} - -run_docker() { - local hacks="${DIR_OSMODEV}/src/osmo-ttcn3-hacks" - local docker_dir="$(get_testsuite_dir_docker)" - local docker_name="$(basename "$docker_dir")" - local marker="${DIR_OSMODEV}/ttcn3/make/.docker.$docker_name.$IMAGE_SUFFIX" - - # Skip building docker containers if this already ran - if [ -e "$marker" ]; then - echo "NOTE: skipping docker container build, because marker exists: $marker" - export NO_DOCKER_IMAGE_BUILD=1 - fi - - cd "$(get_testsuite_dir_docker)" - DOCKER_ARGS="\ - -e LD_LIBRARY_PATH=/usr/local/lib \ - -v "$DIR_USR_LOCAL":/usr/local \ - -v "$DIR_VAR_LOCAL":/var/local \ - -v $hacks:/osmo-ttcn3-hacks:ro \ - " - if [ -n "$ARG_TEST_NAME" ]; then - DOCKER_ARGS="$DOCKER_ARGS -e TEST_NAME=$ARG_TEST_NAME" - fi - - export DOCKER_ARGS - export NO_LIST_OSMO_PACKAGES=1 - export TEST_CONFIGS="$ARG_TEST_CONFIGS" - ./jenkins.sh - - touch "$marker" -} - -remove_old_logs() { - sudo rm -rf /tmp/tmp.* 2>/dev/null -} - -collect_logs() { - # Format logs - for log in /tmp/logs/*-tester*/*.merged; do - ttcn3_logformat -o "${log}.log" "$log" - sudo rm "$log" - done - - # Print log path - echo "---" - echo "Logs: /tmp/logs" - echo "---" -} - -clean "$@" -parse_args "$@" -check_usage -check_ttcn3_install -setup_dir_make -clone_repo "osmo-ttcn3-hacks" -clone_repo "docker-playground" -check_dir_testsuite -prepare_local_bin -build_extra_libraries -build_osmo_programs -build_kernel -prepare_docker_testsuite_container -build_testsuite -remove_old_logs -run_docker -collect_logs -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/40356?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I5c53dadd24786240eaaca6d487bac02538556ebe Gerrit-Change-Number: 40356 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 month

1
0
0 0

[M] Change in osmo-dev[master]: gen_makefile: {make,src}_dir: use absolute paths

by osmith

osmith has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-dev/+/40347?usp=email ) Change subject: gen_makefile: {make,src}_dir: use absolute paths ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/40347?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I8bb2af7ffb902fd690e83e36739c2b4415b9ab80 Gerrit-Change-Number: 40347 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Fri, 23 May 2025 13:31:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No

1 month

1
0
0 0

[XS] Change in ...osmo-s1gw[master]: debian: drop unneeded libpcap-dev

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40348?usp=email ) Change subject: debian: drop unneeded libpcap-dev ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40348?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I4c152b6f5f517acccfe4aa856447c59eb1212707 Gerrit-Change-Number: 40348 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 23 May 2025 13:13:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 month

1
0
0 0

[XS] Change in ...osmo-s1gw[master]: debian: drop unneeded libpcap-dev

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40348?usp=email ) Change subject: debian: drop unneeded libpcap-dev ...................................................................... debian: drop unneeded libpcap-dev Change-Id: I4c152b6f5f517acccfe4aa856447c59eb1212707 --- M debian/control 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-s1gw refs/changes/48/40348/1 diff --git a/debian/control b/debian/control index 35f690d..10eddac 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,6 @@ Priority: optional Build-Depends: erlang-nox, libnftables-dev, - libpcap-dev, rebar3, debhelper (>= 10) Standards-Version: 4.5.0 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40348?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I4c152b6f5f517acccfe4aa856447c59eb1212707 Gerrit-Change-Number: 40348 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

1 month

1
0
0 0

[M] Change in osmo-dev[master]: gen_makefile: {make,src}_dir: use absolute paths

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-dev/+/40347?usp=email ) Change subject: gen_makefile: {make,src}_dir: use absolute paths ...................................................................... gen_makefile: {make,src}_dir: use absolute paths Fix generating wrong relative paths when the make dir (-m) is in the same directory as gen_makefile.py. This was too easy to get wrong with relative paths as shown in the previous patches. I've added tests to mitigate this and switched to absolute paths to make the logic easier to follow. Fix for: $ ./gen_makefile.py -m build $ make -C build libosmocore … cd build/../src/libosmocore; autoreconf -fi /bin/sh: 1: cd: can't cd to build/../src/libosmocore Fixes: 8ea5c0ce ("gen_makefile: fix building open5gs") Change-Id: I8bb2af7ffb902fd690e83e36739c2b4415b9ab80 --- A contrib/jenkins.sh M gen_makefile.py A pytest.ini A tests/test_gen_makefile.py 4 files changed, 78 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/47/40347/1 diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh new file mode 100644 index 0000000..07c23a5 --- /dev/null +++ b/contrib/jenkins.sh @@ -0,0 +1,3 @@ +#!/bin/sh -ex + +pytest -v diff --git a/gen_makefile.py b/gen_makefile.py index c6e4a0b..44c257d 100755 --- a/gen_makefile.py +++ b/gen_makefile.py @@ -437,7 +437,7 @@ def gen_src_proj_copy(src_proj, make_dir, proj): if not is_src_copy_needed(proj): - return os.path.join(make_dir, src_proj) + return src_proj return os.path.join(make_dir, "src_copy", proj) def gen_make(proj, deps, configure_opts, jobs, make_dir, src_dir, build_dir, url, push_url, sudo_make_install, no_ldconfig, ldconfig_without_sudo, make_check): @@ -445,8 +445,6 @@ if proj == 'openbsc': src_proj = os.path.join(src_proj, 'openbsc') - src = os.path.relpath(src_dir, make_dir) - src_proj = os.path.relpath(src_proj, make_dir) src_proj_copy = gen_src_proj_copy(src_proj, make_dir, proj) build_proj = os.path.join(build_dir, proj) @@ -491,7 +489,7 @@ -and -not -name "config.h" 2>/dev/null) {gen_makefile_clone(proj, - src, + src_dir, src_proj, url, push_url, @@ -559,6 +557,9 @@ opts_names = '+'.join([f.replace('.opts', '') for f in configure_opts_files]) make_dir = 'make-%s' % opts_names +make_dir = os.path.abspath(make_dir) +src_dir = os.path.abspath(args.src_dir) + if not os.path.isdir(make_dir): os.makedirs(make_dir) @@ -693,7 +694,7 @@ 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, args.jobs, - make_dir, args.src_dir, build_dir, args.url, args.push_url, + make_dir, src_dir, build_dir, args.url, args.push_url, args.sudo_make_install, args.no_ldconfig, args.ldconfig_without_sudo, args.make_check) diff --git a/pytest.ini b/pytest.ini new file mode 100644 index 0000000..15f83b0 --- /dev/null +++ b/pytest.ini @@ -0,0 +1,3 @@ +[pytest] +testpaths = tests +addopts = --tb=short diff --git a/tests/test_gen_makefile.py b/tests/test_gen_makefile.py new file mode 100644 index 0000000..2ae0667 --- /dev/null +++ b/tests/test_gen_makefile.py @@ -0,0 +1,66 @@ +#!/usr/bin/env python3 +# Copyright 2025 sysmocom - s.f.m.c. GmbH +# SPDX-License-Identifier: GPL-3.0-or-later +import os +import shlex +import subprocess + +osmo_dev_path = os.path.realpath(os.path.join(__file__, "../../")) + + +def run_cmd(cmd, *args, **kwargs): + print(f"+ {cmd}") + return subprocess.run(cmd, check=True, *args, **kwargs) + + +def run_make_regen_2x(cwd): + """The "make regen" command regenerates the Makefile. Ensure that this + works twice in a row.""" + run_cmd(["make", "regen"], cwd=cwd) + run_cmd(["make", "regen"], cwd=cwd) + + +def put_gen_makefile_into_tmp_path(tmp_path): + """Ensure running gen_makefile.py -m=<relative path> works as expected.""" + run_cmd(f"cp -v *.* {shlex.quote(str(tmp_path))}", cwd=osmo_dev_path, shell=True) + run_cmd(["ln", "-s", os.path.join(osmo_dev_path, "src"), os.path.join(tmp_path, "src")]) + + +def test_make_libosmocore_autoconf(tmp_path): + run_cmd(["./gen_makefile.py", "default.opts", "iu.opts", "no_dahdi.opts", "-m", tmp_path], cwd=osmo_dev_path) + run_cmd(["make", ".make.libosmocore.autoconf"], cwd=tmp_path) + run_make_regen_2x(tmp_path) + + +def test_make_libosmocore_autoconf_src_copy(tmp_path): + run_cmd(["./gen_makefile.py", "-m", tmp_path, "--autoreconf-in-src-copy"], cwd=osmo_dev_path) + run_cmd(["make", ".make.libosmocore.autoconf"], cwd=tmp_path) + run_make_regen_2x(tmp_path) + + +def test_make_libosmocore_autoconf_relative_makedir(tmp_path): + put_gen_makefile_into_tmp_path(tmp_path) + run_cmd(["./gen_makefile.py", "-m", "make"], cwd=tmp_path) + make_path = os.path.join(tmp_path, "make") + run_cmd(["make", ".make.libosmocore.autoconf"], cwd=make_path) + run_make_regen_2x(make_path) + + +def test_make_libosmocore_autoconf_relative_makedir_src_copy(tmp_path): + put_gen_makefile_into_tmp_path(tmp_path) + run_cmd(["./gen_makefile.py", "-m", "make", "--autoreconf-in-src-copy"], cwd=tmp_path) + make_path = os.path.join(tmp_path, "make") + run_cmd(["make", ".make.libosmocore.autoconf"], cwd=make_path) + run_make_regen_2x(make_path) + + +def test_make_open5gs_configure(tmp_path): + run_cmd(["./gen_makefile.py", "-m", tmp_path], cwd=osmo_dev_path) + run_cmd(["make", ".make.open5gs.configure"], cwd=tmp_path) + run_make_regen_2x(tmp_path) + + +def test_make_open5gs_configure_src_copy(tmp_path): + run_cmd(["./gen_makefile.py", "-m", tmp_path, "--autoreconf-in-src-copy"], cwd=osmo_dev_path) + run_cmd(["make", ".make.open5gs.configure"], cwd=tmp_path) + run_make_regen_2x(tmp_path) -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/40347?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I8bb2af7ffb902fd690e83e36739c2b4415b9ab80 Gerrit-Change-Number: 40347 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 month

1
0
0 0

2025

2024

2023

2022

gerrit-log May 2025