pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18772 )
Change subject: ttcn3: Don't overwrite output junit file on multiple testsuites
......................................................................
ttcn3: Don't overwrite output junit file on multiple testsuites
Change-Id: I803fa8766acb4e90c4a735a420b24ef18ef6b0c9
---
M sysmocom/ttcn3/suites/ttcn3_bts_tests/lib/testlib.py
M sysmocom/ttcn3/suites/ttcn3_bts_tests/scripts/run_ttcn3_docker.sh
2 files changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester
refs/changes/72/18772/1
diff --git a/sysmocom/ttcn3/suites/ttcn3_bts_tests/lib/testlib.py
b/sysmocom/ttcn3/suites/ttcn3_bts_tests/lib/testlib.py
index f0e8667..394e76e 100644
--- a/sysmocom/ttcn3/suites/ttcn3_bts_tests/lib/testlib.py
+++ b/sysmocom/ttcn3/suites/ttcn3_bts_tests/lib/testlib.py
@@ -10,7 +10,7 @@
bts_tmpl_file = os.path.join(testdir, 'scripts', 'BTS_Tests.cfg.tmpl')
script_run_dir = tenv.test().get_run_dir().new_dir('ttcn3')
bts_cfg_file = os.path.join(str(script_run_dir), 'BTS_Tests.cfg')
- junit_ttcn3_dst_file =
os.path.join(str(tenv.suite().trial().get_run_dir()), 'trial-') +
tenv.test().basename + '.xml'
+ junit_ttcn3_dst_file =
os.path.join(str(tenv.suite().trial().get_run_dir()), 'trial-' +
tenv.suite().name() + '.' + tenv.test().module_name() + '.xml')
if bts.bts_type() == 'osmo-bts-trx':
pcu_available = True
pcu_sk = bts.pcu_socket_path()
diff --git a/sysmocom/ttcn3/suites/ttcn3_bts_tests/scripts/run_ttcn3_docker.sh
b/sysmocom/ttcn3/suites/ttcn3_bts_tests/scripts/run_ttcn3_docker.sh
index daac3e0..535268a 100755
--- a/sysmocom/ttcn3/suites/ttcn3_bts_tests/scripts/run_ttcn3_docker.sh
+++ b/sysmocom/ttcn3/suites/ttcn3_bts_tests/scripts/run_ttcn3_docker.sh
@@ -88,6 +88,6 @@
echo "Copying TTCN3 junit file to $JUNIT_TTCN3_DST_FILE"
cp $VOL_BASE_DIR/bts-tester/junit-xml-*.log $JUNIT_TTCN3_DST_FILE
-sed -i "s#classname='BTS_Tests'#classname='$(basename
$JUNIT_TTCN3_DST_FILE)'#g" $JUNIT_TTCN3_DST_FILE
+sed -i "s#classname='BTS_Tests'#classname='$(basename $JUNIT_TTCN3_DST_FILE
'.xml')'#g" $JUNIT_TTCN3_DST_FILE
exit $child_exit_code
--
To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18772
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-gsm-tester
Gerrit-Branch: master
Gerrit-Change-Id: I803fa8766acb4e90c4a735a420b24ef18ef6b0c9
Gerrit-Change-Number: 18772
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pes...@sysmocom.de>
Gerrit-MessageType: newchange
