ttcn*test: use log_merge.sh to generate per-testcase merged logs

5 years ago · 2f5541b134
parent c99a78fc9e
commit 2f5541b134
8 changed files with 8 additions and 8 deletions
--- a/ggsn-test/Dockerfile
+++ b/ggsn-test/Dockerfile
@ -23,4 +23,4 @@ COPY	GGSN_Tests.cfg /data/GGSN_Tests.cfg

 CMD	cd /data && \
 	/osmo-ttcn3-hacks/start-testsuite.sh /osmo-ttcn3-hacks/ggsn_tests/GGSN_Tests && \
-	ttcn3_logmerge GGSN*.log
+	/osmo-ttcn3-hacks/log_merge.sh GGSN_Tests --rm
--- a/mgw-test/Dockerfile
+++ b/mgw-test/Dockerfile
@ -24,4 +24,4 @@ COPY	MGCP_Test.cfg /data/MGCP_Test.cfg

 CMD	cd /data && \
 	/osmo-ttcn3-hacks/start-testsuite.sh /osmo-ttcn3-hacks/mgw/MGCP_Test && \
-	ttcn3_logmerge MGCP*.log
+	/osmo-ttcn3-hacks/log_merge.sh MGCP_Test --rm
--- a/ttcn3-bsc-test/Dockerfile
+++ b/ttcn3-bsc-test/Dockerfile
@ -28,4 +28,4 @@ COPY	BSC_Tests.cfg /data/BSC_Tests.cfg

 CMD	cd /data && \
 	/osmo-ttcn3-hacks/start-testsuite.sh /osmo-ttcn3-hacks/bsc/BSC_Tests && \
-	ttcn3_logmerge BSC*.log
+	/osmo-ttcn3-hacks/log_merge.sh BSC_Tests --rm
--- a/ttcn3-bts-test/Dockerfile
+++ b/ttcn3-bts-test/Dockerfile
@ -28,4 +28,4 @@ COPY	BTS_Tests.cfg /data/BTS_Tests.cfg

 CMD	cd /data && \
 	/osmo-ttcn3-hacks/start-testsuite.sh /osmo-ttcn3-hacks/bts/BTS_Tests && \
-	ttcn3_logmerge BTS*.log
+	/osmo-ttcn3-hacks/log_merge.sh BTS_Tests --rm
--- a/ttcn3-hlr-test/Dockerfile
+++ b/ttcn3-hlr-test/Dockerfile
@ -28,4 +28,4 @@ COPY	HLR_Tests.cfg /data/HLR_Tests.cfg

 CMD	cd /data && \
 	/osmo-ttcn3-hacks/start-testsuite.sh /osmo-ttcn3-hacks/hlr/HLR_Tests && \
-	ttcn3_logmerge HLR*.log
+	/osmo-ttcn3-hacks/log_merge.sh HLR_Tests --rm
--- a/ttcn3-msc-test/Dockerfile
+++ b/ttcn3-msc-test/Dockerfile
@ -28,4 +28,4 @@ COPY	MSC_Tests.cfg /data/MSC_Tests.cfg

 CMD	cd /data && \
 	/osmo-ttcn3-hacks/start-testsuite.sh /osmo-ttcn3-hacks/msc/MSC_Tests && \
-	ttcn3_logmerge MSC*.log
+	/osmo-ttcn3-hacks/log_merge.sh MSC_Tests --rm
--- a/ttcn3-nitb-sysinfo/Dockerfile
+++ b/ttcn3-nitb-sysinfo/Dockerfile
@ -21,4 +21,4 @@ COPY	Test.cfg /data/Test.cfg

 CMD	cd /data && \
 	/osmo-ttcn3-hacks/start-testsuite.sh /osmo-ttcn3-hacks/sysinfo/Test && \
-	ttcn3_logmerge Test*.log
+	/osmo-ttcn3-hacks/log_merge.sh Test
--- a/ttcn3-sgsn-test/Dockerfile
+++ b/ttcn3-sgsn-test/Dockerfile
@ -28,4 +28,4 @@ COPY	SGSN_Tests.cfg /data/SGSN_Tests.cfg

 CMD	cd /data && \
 	/osmo-ttcn3-hacks/start-testsuite.sh /osmo-ttcn3-hacks/sgsn/SGSN_Tests && \
-	ttcn3_logmerge SGSN*.log
+	/osmo-ttcn3-hacks/log_merge.sh SGSN_Tests --rm