osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40210?usp=email )
Change subject: Common.cfg: Logging: add %p to LogFile format ......................................................................
Common.cfg: Logging: add %p to LogFile format
Add the process ID at the end of the log file that ttnc3 writes, to avoid potential conflicts:
Otherwise if you have eg TC_foobar in STP_Tests_M3UA and STP_Tests_IPA, you may end up rewriting one of them since both would be written with the same file name.
%e is the name of the TTCN-3 executable, e.g. STP_Tests even if the test case is in STP_Tests_M3UA. It is not possible to get STP_Tests_M3UA into the file name with any of the meta characters, I've tried it out.
Related: https://gitlab.eclipse.org/eclipse/titan/titan.core/-/blob/9.0.0/usrguide/re... Change-Id: I0a2a376cd11784addff8ca228e3cc3e831b418a2 --- M Common.cfg M log_merge.sh 2 files changed, 2 insertions(+), 2 deletions(-)
Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve
diff --git a/Common.cfg b/Common.cfg index b8c76e6..045a745 100644 --- a/Common.cfg +++ b/Common.cfg @@ -6,7 +6,7 @@ TCPDUMP_STOP := $TTCN3_HACKS_PATH"/ttcn3-tcpdump-stop.sh"
[LOGGING] -LogFile := "%e-%c-%h-%r.%s" +LogFile := "%e-%c-%h-%r-%p.%s" AppendFile := Yes; SourceInfoFormat := Single; LogSourceInfo := Yes; diff --git a/log_merge.sh b/log_merge.sh index 886b788..d3d5986 100755 --- a/log_merge.sh +++ b/log_merge.sh @@ -3,7 +3,7 @@ # This script generates per-testcase merged logs. # In order to work, you need to set the following test config: # [LOGGING] -# LogFile := "%e-%c-%h-%r.%s" +# LogFile := "%e-%c-%h-%r-%p.%s" # # the output files will be called "Module-Testcase.merged"