November 2022 - gerrit-log - lists.osmocom.org

Change in simtrace2[master]: main: rotor: erase immediately after send

by jtavares

jtavares has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/30135 ) Change subject: main: rotor: erase immediately after send ...................................................................... main: rotor: erase immediately after send - improves trace diagnostic output by moving cursor back over the the rotor before a diagnostic message has a chance to be printed. there is still a race condition, but it is much better. Change-Id: Iad7767f2a5dbbd67b0f33b9bfc2c3864ce308990 --- M firmware/apps/cardem/main.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/35/30135/1 diff --git a/firmware/apps/cardem/main.c b/firmware/apps/cardem/main.c index 4c337c8..6372e04 100644 --- a/firmware/apps/cardem/main.c +++ b/firmware/apps/cardem/main.c @@ -194,8 +194,8 @@ WDT_Restart(WDT); #if TRACE_LEVEL >= TRACE_LEVEL_DEBUG const char rotor[] = { '-', '\\', '|', '/' }; - putchar('\b'); putchar(rotor[i++ % ARRAY_SIZE(rotor)]); + putchar('\b'); #endif check_exec_dbg_cmd(); osmo_timers_prepare(); -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/30135 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Iad7767f2a5dbbd67b0f33b9bfc2c3864ce308990 Gerrit-Change-Number: 30135 Gerrit-PatchSet: 1 Gerrit-Owner: jtavares <jtavares(a)kvh.com> Gerrit-MessageType: newchange

2 years, 7 months

1
0
0 0

Change in osmo-ttcn3-hacks[arehbein/wip]: WIP: ttcn3-dumpcap*.sh: Don't use lsof

by arehbein

arehbein has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30134 ) Change subject: WIP: ttcn3-dumpcap*.sh: Don't use lsof ...................................................................... WIP: ttcn3-dumpcap*.sh: Don't use lsof `lsof` isn't available in the docker image, use /proc fs instead to get the shell type Related: OS#5736 Change-Id: Ie34eaa778f78b9685dd601d5e9898829caf0c7ca --- M ttcn3-tcpdump-stop.sh 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified arehbein: Looks good to me, approved diff --git a/ttcn3-tcpdump-stop.sh b/ttcn3-tcpdump-stop.sh index a649fd0..c1ce29f 100755 --- a/ttcn3-tcpdump-stop.sh +++ b/ttcn3-tcpdump-stop.sh @@ -24,7 +24,8 @@ date # -e only works/is required only in Bash; in dash/POSIX shells it isn't required and will be part of the output -if (lsof -p $$ | grep -q /usr/bin/bash); then +SHELL="$(cat /proc/$$/cmdline | tr -d '\0')" +if [ "$SHELL" = "bash" ]; then ESCAPE_OPT="-e" else ESCAPE_OPT="" -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30134 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: arehbein/wip Gerrit-Change-Id: Ie34eaa778f78b9685dd601d5e9898829caf0c7ca Gerrit-Change-Number: 30134 Gerrit-PatchSet: 1 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: arehbein <arehbein(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 7 months

1
0
0 0

Change in osmo-ttcn3-hacks[arehbein/wip]: WIP: ttcn3-dumpcap*.sh: Don't use lsof

by arehbein

arehbein has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30134 ) Change subject: WIP: ttcn3-dumpcap*.sh: Don't use lsof ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30134 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: arehbein/wip Gerrit-Change-Id: Ie34eaa778f78b9685dd601d5e9898829caf0c7ca Gerrit-Change-Number: 30134 Gerrit-PatchSet: 1 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: arehbein <arehbein(a)sysmocom.de> Gerrit-Comment-Date: Sun, 13 Nov 2022 21:33:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 7 months

1
0
0 0

Change in osmo-ttcn3-hacks[arehbein/wip]: WIP: ttcn3-dumpcap*.sh: Don't use lsof

by arehbein

arehbein has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30134 ) Change subject: WIP: ttcn3-dumpcap*.sh: Don't use lsof ...................................................................... WIP: ttcn3-dumpcap*.sh: Don't use lsof `lsof` isn't available in the docker image, use /proc fs instead to get the shell type Related: OS#5736 Change-Id: Ie34eaa778f78b9685dd601d5e9898829caf0c7ca --- M ttcn3-tcpdump-stop.sh 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/34/30134/1 diff --git a/ttcn3-tcpdump-stop.sh b/ttcn3-tcpdump-stop.sh index a649fd0..c1ce29f 100755 --- a/ttcn3-tcpdump-stop.sh +++ b/ttcn3-tcpdump-stop.sh @@ -24,7 +24,8 @@ date # -e only works/is required only in Bash; in dash/POSIX shells it isn't required and will be part of the output -if (lsof -p $$ | grep -q /usr/bin/bash); then +SHELL="$(cat /proc/$$/cmdline | tr -d '\0')" +if [ "$SHELL" = "bash" ]; then ESCAPE_OPT="-e" else ESCAPE_OPT="" -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30134 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: arehbein/wip Gerrit-Change-Id: Ie34eaa778f78b9685dd601d5e9898829caf0c7ca Gerrit-Change-Number: 30134 Gerrit-PatchSet: 1 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 7 months

1
0
0 0

Change in osmo-ttcn3-hacks[arehbein/wip]: WIP: ttcn3-tcpdump*.sh: Fix output of special chars

by arehbein

arehbein has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30130 ) Change subject: WIP: ttcn3-tcpdump*.sh: Fix output of special chars ...................................................................... WIP: ttcn3-tcpdump*.sh: Fix output of special chars Don't print '-e' option in non-bash shells. Related: OS#5736 Change-Id: I4f259e50465132a123ac47b1638de878759a9ba4 --- M ttcn3-tcpdump-stop.sh 1 file changed, 10 insertions(+), 3 deletions(-) Approvals: arehbein: Looks good to me, approved; Verified diff --git a/ttcn3-tcpdump-stop.sh b/ttcn3-tcpdump-stop.sh index 2ddae71..a649fd0 100755 --- a/ttcn3-tcpdump-stop.sh +++ b/ttcn3-tcpdump-stop.sh @@ -23,10 +23,17 @@ date -if [ x"$VERDICT" = x"pass" ]; then - echo -e "\033[1;32m====== $TESTCASE $VERDICT ======\033[0m" +# -e only works/is required only in Bash; in dash/POSIX shells it isn't required and will be part of the output +if (lsof -p $$ | grep -q /usr/bin/bash); then + ESCAPE_OPT="-e" else - echo -e "\033[1;31m------ $TESTCASE $VERDICT ------\033[0m" + ESCAPE_OPT="" +fi + +if [ x"$VERDICT" = x"pass" ]; then + echo $ESCAPE_OPT "\033[1;32m====== $TESTCASE $VERDICT ======\033[0m" +else + echo $ESCAPE_OPT "\033[1;31m------ $TESTCASE $VERDICT ------\033[0m" fi echo -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30130 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: arehbein/wip Gerrit-Change-Id: I4f259e50465132a123ac47b1638de878759a9ba4 Gerrit-Change-Number: 30130 Gerrit-PatchSet: 1 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: arehbein <arehbein(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 7 months

1
0
0 0

Change in osmo-ttcn3-hacks[arehbein/wip]: WIP: ttcn3-tcpdump*.sh: Fix output of special chars

by arehbein

arehbein has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30130 ) Change subject: WIP: ttcn3-tcpdump*.sh: Fix output of special chars ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30130 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: arehbein/wip Gerrit-Change-Id: I4f259e50465132a123ac47b1638de878759a9ba4 Gerrit-Change-Number: 30130 Gerrit-PatchSet: 1 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: arehbein <arehbein(a)sysmocom.de> Gerrit-Comment-Date: Sun, 13 Nov 2022 19:24:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 7 months

1
0
0 0

Change in osmo-ttcn3-hacks[arehbein/wip]: WIP: ttcn3-tcpdump*.sh: Fix output of special chars

by arehbein

arehbein has removed Jenkins Builder from this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30130 ) Change subject: WIP: ttcn3-tcpdump*.sh: Fix output of special chars ...................................................................... Removed reviewer Jenkins Builder with the following votes: * Verified+1 by Jenkins Builder (1000002) -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30130 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: arehbein/wip Gerrit-Change-Id: I4f259e50465132a123ac47b1638de878759a9ba4 Gerrit-Change-Number: 30130 Gerrit-PatchSet: 1 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: arehbein <arehbein(a)sysmocom.de> Gerrit-MessageType: deleteReviewer

2 years, 7 months

1
0
0 0

Change in osmo-ttcn3-hacks[arehbein/wip]: WIP: ttcn3-tcpdump*.sh: Log errors to addtional file

by arehbein

arehbein has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30129 ) Change subject: WIP: ttcn3-tcpdump*.sh: Log errors to addtional file ...................................................................... WIP: ttcn3-tcpdump*.sh: Log errors to addtional file The old output is preserved, too, in order to ensure compatibility with expectations regarding legacy behavior. Related: OS#5736 Change-Id: Iac919e94ee4694dea04a5c5349013c1989c90810 --- M ttcn3-tcpdump-start.sh M ttcn3-tcpdump-stop.sh 2 files changed, 22 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified arehbein: Looks good to me, approved diff --git a/ttcn3-tcpdump-start.sh b/ttcn3-tcpdump-start.sh index a2dc21f..425a432 100755 --- a/ttcn3-tcpdump-start.sh +++ b/ttcn3-tcpdump-start.sh @@ -71,9 +71,28 @@ PID=$! echo $PID > $PIDFILE_NETCAT -$CMD -s 1500 -n -i any -w "$TTCN3_PCAP_PATH/$TESTCASE.pcap" >$TTCN3_PCAP_PATH/$TESTCASE.pcap.stdout 2>&1 & +CMD_OUTFILE=$TTCN3_PCAP_PATH/$TESTCASE.pcap.stdout +CMD_OUTFILE_ERR=$TTCN3_PCAP_PATH/$TESTCASE.pcap_err +FIFO=/tmp/cmderr +if ! [ -e $FIFO ]; then + mkfifo $FIFO +else + echo "Warning: Named pipe already exists: $FIFO" +fi + +# Log stderr to CMD_OUTFILE and a dedicated error log file +tee $CMD_OUTFILE < $FIFO > $CMD_OUTFILE_ERR & +CMD_STR="$CMD -s 1500 -n -i any -w \"$TTCN3_PCAP_PATH/$TESTCASE.pcap\" >$CMD_OUTFILE 2>$FIFO &" +eval $CMD_STR +# $CMD -s 1500 -n -i any -w \"$TTCN3_PCAP_PATH/$TESTCASE.pcap\" >$CMD_OUTFILE & PID=$! echo $PID > $PIDFILE_PCAP +if [ -f $CMD_OUTFILE_ERR ] && [ $(wc -l $CMD_OUTFILE_ERR | awk '{print $1}') -ne 0 ]; then + echo "Error running command:" >&2 + echo " $CMD_STR" >&2 + echo "Error message:" >&2 + echo " $(cat $CMD_OUTFILE_ERR)" >&2 +fi # Wait until packet dumper creates the pcap file and starts recording. # We generate some traffic until we see packet dumper catches it. diff --git a/ttcn3-tcpdump-stop.sh b/ttcn3-tcpdump-stop.sh index 7927e9c..2ddae71 100755 --- a/ttcn3-tcpdump-stop.sh +++ b/ttcn3-tcpdump-stop.sh @@ -68,5 +68,7 @@ kill_rm_pidfile "$PIDFILE_PCAP" kill_rm_pidfile "$PIDFILE_NETCAT" +FIFO=cmderr +rm $FIFO gzip -f "$TTCN3_PCAP_PATH/$TESTCASE.pcap" -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30129 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: arehbein/wip Gerrit-Change-Id: Iac919e94ee4694dea04a5c5349013c1989c90810 Gerrit-Change-Number: 30129 Gerrit-PatchSet: 1 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: arehbein <arehbein(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 7 months

1
0
0 0

Change in osmo-ttcn3-hacks[arehbein/wip]: WIP: ttcn3-tcpdump*.sh: Log errors to addtional file

by arehbein

arehbein has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30129 ) Change subject: WIP: ttcn3-tcpdump*.sh: Log errors to addtional file ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30129 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: arehbein/wip Gerrit-Change-Id: Iac919e94ee4694dea04a5c5349013c1989c90810 Gerrit-Change-Number: 30129 Gerrit-PatchSet: 1 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: arehbein <arehbein(a)sysmocom.de> Gerrit-Comment-Date: Sun, 13 Nov 2022 18:37:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 7 months

1
0
0 0

Change in osmo-ttcn3-hacks[arehbein/wip]: WIP: ttcn3-tcpdump*.sh: Fix output of special chars

by arehbein

arehbein has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30130 ) Change subject: WIP: ttcn3-tcpdump*.sh: Fix output of special chars ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30130 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: arehbein/wip Gerrit-Change-Id: I4f259e50465132a123ac47b1638de878759a9ba4 Gerrit-Change-Number: 30130 Gerrit-PatchSet: 1 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: arehbein <arehbein(a)sysmocom.de> Gerrit-Comment-Date: Sun, 13 Nov 2022 18:37:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 7 months

1
0
0 0

2025

2024

2023

2022

gerrit-log November 2022