From 2f5541b1343f7aee369a10cb15e89ccd3cd1fe4e Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Sun, 18 Mar 2018 13:19:34 +0000 Subject: [PATCH] ttcn*test: use log_merge.sh to generate per-testcase merged logs --- ggsn-test/Dockerfile | 2 +- mgw-test/Dockerfile | 2 +- ttcn3-bsc-test/Dockerfile | 2 +- ttcn3-bts-test/Dockerfile | 2 +- ttcn3-hlr-test/Dockerfile | 2 +- ttcn3-msc-test/Dockerfile | 2 +- ttcn3-nitb-sysinfo/Dockerfile | 2 +- ttcn3-sgsn-test/Dockerfile | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ggsn-test/Dockerfile b/ggsn-test/Dockerfile index 5a29922a..3c676cde 100644 --- 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 diff --git a/mgw-test/Dockerfile b/mgw-test/Dockerfile index 2603ee60..423e9df2 100644 --- 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 diff --git a/ttcn3-bsc-test/Dockerfile b/ttcn3-bsc-test/Dockerfile index 4ce55b80..0a4b4e6e 100644 --- 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 diff --git a/ttcn3-bts-test/Dockerfile b/ttcn3-bts-test/Dockerfile index 8ce3656d..0c82ff18 100644 --- 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 diff --git a/ttcn3-hlr-test/Dockerfile b/ttcn3-hlr-test/Dockerfile index 1f56c154..a6ffb055 100644 --- 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 diff --git a/ttcn3-msc-test/Dockerfile b/ttcn3-msc-test/Dockerfile index e9b3cf61..e2a43103 100644 --- 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 diff --git a/ttcn3-nitb-sysinfo/Dockerfile b/ttcn3-nitb-sysinfo/Dockerfile index 89be2e0f..fb5ceb21 100644 --- 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 diff --git a/ttcn3-sgsn-test/Dockerfile b/ttcn3-sgsn-test/Dockerfile index b6267bde..23117c4c 100644 --- 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