October 2023 - gerrit-log - lists.osmocom.org

[M] Change in osmo-dev[master]: ttcn3.sh: add getopts
by osmith 12 Oct '23

12 Oct '23

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/34699?usp=email ) Change subject: ttcn3.sh: add getopts ...................................................................... ttcn3.sh: add getopts Add getopts parsing. The idea was to add support for setting a different IMAGE_SUFFIX argument, but later on it became clear it is not worth implementing here. Add the getopts logic anyway because it can be used to add other arguments in the future. Change-Id: If55a982d92b2a24a175ab7f3a8f048f054033dc2 --- M ttcn3/ttcn3.sh 1 file changed, 45 insertions(+), 9 deletions(-) Approvals: osmith: Looks good to me, approved; Verified diff --git a/ttcn3/ttcn3.sh b/ttcn3/ttcn3.sh index 74e87cc..3563062 100755 --- a/ttcn3/ttcn3.sh +++ b/ttcn3/ttcn3.sh @@ -1,6 +1,6 @@ #!/bin/sh -e -PROJECT="$1" -PROJECT_UPPER="$(echo "$PROJECT" | tr '[:lower:]' '[:upper:]')" +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}" @@ -14,15 +14,36 @@ DOCKER_IMG_BUILD="debian-bookworm-build" DOCKER_IMG_TITAN="debian-bookworm-titan" +parse_args() { + while getopts 'h' OPTION; do + case "$OPTION" in + h|*) + local name="$(basename $0)" + echo "usage: $name [-h] PROJECT" + echo "arguments:" + echo " -h show help" + echo " PROJECT the testsuite project to run" + echo "examples:" + echo " $name bsc" + echo " $name bsc-sccplite" + echo " $name hlr" + exit 1 + ;; + esac + done + shift "$(($OPTIND - 1))" + + if [ "$#" != "1" ]; then + parse_args -h + fi + + PROJECT="$1" + PROJECT_UPPER="$(echo "$PROJECT" | tr '[:lower:]' '[:upper:]')" +} + check_usage() { - local name="$(basename $0)" if [ -z "$PROJECT" ]; then - echo "usage: $name PROJECT" - echo "examples:" - echo " * $name bsc" - echo " * $name bsc-sccplite" - echo " * $name hlr" - exit 1 + parse_args -h fi } @@ -359,6 +380,7 @@ echo "---" } +parse_args "$@" check_usage check_ttcn3_install setup_dir_make -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/34699?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: If55a982d92b2a24a175ab7f3a8f048f054033dc2 Gerrit-Change-Number: 34699 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in osmo-dev[master]: ttcn3.sh: add clean argument
by osmith 12 Oct '23

12 Oct '23

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/34700?usp=email ) Change subject: ttcn3.sh: add clean argument ...................................................................... ttcn3.sh: add clean argument Change-Id: If779b87c02d01b877e44118db34bdf2c83dbf619 --- M ttcn3/ttcn3.sh 1 file changed, 27 insertions(+), 0 deletions(-) Approvals: osmith: Looks good to me, approved; Verified diff --git a/ttcn3/ttcn3.sh b/ttcn3/ttcn3.sh index 3563062..68dec64 100755 --- a/ttcn3/ttcn3.sh +++ b/ttcn3/ttcn3.sh @@ -14,12 +14,29 @@ DOCKER_IMG_BUILD="debian-bookworm-build" 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" + exit 0 +} + parse_args() { while getopts 'h' OPTION; do case "$OPTION" in h|*) local name="$(basename $0)" echo "usage: $name [-h] PROJECT" + echo " or: $name clean" echo "arguments:" echo " -h show help" echo " PROJECT the testsuite project to run" @@ -380,6 +397,7 @@ echo "---" } +clean "$@" parse_args "$@" check_usage check_ttcn3_install -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/34700?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: If779b87c02d01b877e44118db34bdf2c83dbf619 Gerrit-Change-Number: 34700 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in osmo-dev[master]: ttcn3.sh: use ccache
by osmith 12 Oct '23

12 Oct '23

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/34701?usp=email ) Change subject: ttcn3.sh: use ccache ...................................................................... ttcn3.sh: use ccache Use ccache for building Osmocom programs and TTCN-3 testsuites. Change-Id: I800062d0379295a6905851db29e820ff16217653 --- M .gitignore M ttcn3/scripts/docker_configure_make.sh M ttcn3/ttcn3.opts M ttcn3/ttcn3.sh 4 files changed, 20 insertions(+), 2 deletions(-) Approvals: osmith: Looks good to me, approved; Verified diff --git a/.gitignore b/.gitignore index 6aa1dd0..2e88651 100644 --- a/.gitignore +++ b/.gitignore @@ -15,6 +15,7 @@ !net/README !net/fill_config.py ttcn3/3G+2G_ttcn3.deps +ttcn3/ccache/ ttcn3/out/ ttcn3/make/ ttcn3/.run.sh diff --git a/ttcn3/scripts/docker_configure_make.sh b/ttcn3/scripts/docker_configure_make.sh index 25cedb4..56fee71 100755 --- a/ttcn3/scripts/docker_configure_make.sh +++ b/ttcn3/scripts/docker_configure_make.sh @@ -7,12 +7,13 @@ DIR_OSMODEV="$(readlink -f "$(dirname $0)/../..")" DIR_MAKE="$DIR_OSMODEV/ttcn3/make" DIR_USR_LOCAL="$DIR_OSMODEV/ttcn3/usr_local" +DIR_CCACHE="$DIR_OSMODEV/ttcn3/ccache/osmocom-programs" RUN_SCRIPT="$DIR_OSMODEV/ttcn3/.run.sh" DOCKER_IMG="$1" UID="$(id -u)" shift -mkdir -p "$DIR_MAKE" +mkdir -p "$DIR_MAKE" "$DIR_CCACHE" # Script running as user inside docker echo "#!/bin/sh -ex" > "$RUN_SCRIPT" @@ -29,6 +30,7 @@ -v "$DIR_OSMODEV:$DIR_OSMODEV" \ -v "$DIR_USR_LOCAL:/usr/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 diff --git a/ttcn3/ttcn3.opts b/ttcn3/ttcn3.opts index 8acec2d..bf2f472 100644 --- a/ttcn3/ttcn3.opts +++ b/ttcn3/ttcn3.opts @@ -1 +1,2 @@ osmo-bts --enable-trx +ALL CC="/usr/lib/ccache/gcc" CXX="/usr/lib/ccache/g++" diff --git a/ttcn3/ttcn3.sh b/ttcn3/ttcn3.sh index 68dec64..5c5f711 100755 --- a/ttcn3/ttcn3.sh +++ b/ttcn3/ttcn3.sh @@ -338,16 +338,19 @@ 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; - ./regen_makefile.sh; + USE_CCACHE=1 ./regen_makefile.sh; make compile; make -j"$JOBS" " -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/34701?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I800062d0379295a6905851db29e820ff16217653 Gerrit-Change-Number: 34701 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in osmo-dev[master]: ttcn3.sh: use nproc for JOBS
by osmith 12 Oct '23

12 Oct '23

osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/34702?usp=email ) Change subject: ttcn3.sh: use nproc for JOBS ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/34702?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I1971e7758e67a4260ae1398d510cb719db45d101 Gerrit-Change-Number: 34702 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Thu, 12 Oct 2023 15:20:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-dev[master]: ttcn3.sh: use ccache
by osmith 12 Oct '23

12 Oct '23

osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/34701?usp=email ) Change subject: ttcn3.sh: use ccache ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/34701?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I800062d0379295a6905851db29e820ff16217653 Gerrit-Change-Number: 34701 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Thu, 12 Oct 2023 15:20:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-dev[master]: ttcn3.sh: add clean argument
by osmith 12 Oct '23

12 Oct '23

osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/34700?usp=email ) Change subject: ttcn3.sh: add clean argument ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/34700?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: If779b87c02d01b877e44118db34bdf2c83dbf619 Gerrit-Change-Number: 34700 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Thu, 12 Oct 2023 15:20:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in osmo-dev[master]: ttcn3.sh: add getopts
by osmith 12 Oct '23

12 Oct '23

osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/34699?usp=email ) Change subject: ttcn3.sh: add getopts ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/34699?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: If55a982d92b2a24a175ab7f3a8f048f054033dc2 Gerrit-Change-Number: 34699 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Thu, 12 Oct 2023 15:20:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-dev[master]: ttcn3.sh: add clean argument
by osmith 12 Oct '23

12 Oct '23

osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/34700?usp=email ) Change subject: ttcn3.sh: add clean argument ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/34700?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: If779b87c02d01b877e44118db34bdf2c83dbf619 Gerrit-Change-Number: 34700 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Thu, 12 Oct 2023 15:20:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-dev[master]: ttcn3.sh: use nproc for JOBS
by osmith 12 Oct '23

12 Oct '23

osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/34702?usp=email ) Change subject: ttcn3.sh: use nproc for JOBS ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/34702?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I1971e7758e67a4260ae1398d510cb719db45d101 Gerrit-Change-Number: 34702 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Thu, 12 Oct 2023 15:20:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-dev[master]: ttcn3.sh: use ccache
by osmith 12 Oct '23

12 Oct '23

osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/34701?usp=email ) Change subject: ttcn3.sh: use ccache ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/34701?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I800062d0379295a6905851db29e820ff16217653 Gerrit-Change-Number: 34701 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Thu, 12 Oct 2023 15:20:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0