From 618505f98fec31253f528f81a6bf2f5a564005f9 Mon Sep 17 00:00:00 2001 From: Pau Espin Pedrol Date: Fri, 6 Jul 2018 14:47:28 +0200 Subject: ttcn3-*: Merge logfiles no matter resolution of tests Previous to this commit, log messages were not being merged if tests were resolved as failed (test-suite.sh ending with exit code != 0), which can happen if at least one test failed. Change-Id: If293fc2d3182ef2a7b997faa8b41129a9dd89c45 --- ttcn3-sgsn-test/Dockerfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'ttcn3-sgsn-test/Dockerfile') diff --git a/ttcn3-sgsn-test/Dockerfile b/ttcn3-sgsn-test/Dockerfile index dfca1c4..d06195d 100644 --- a/ttcn3-sgsn-test/Dockerfile +++ b/ttcn3-sgsn-test/Dockerfile @@ -26,5 +26,7 @@ RUN ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-start.sh / && \ COPY SGSN_Tests.cfg /data/SGSN_Tests.cfg CMD cd /data && \ - /osmo-ttcn3-hacks/start-testsuite.sh /osmo-ttcn3-hacks/sgsn/SGSN_Tests && \ - /osmo-ttcn3-hacks/log_merge.sh SGSN_Tests --rm + /osmo-ttcn3-hacks/start-testsuite.sh /osmo-ttcn3-hacks/sgsn/SGSN_Tests; \ + exit_code=$?; \ + /osmo-ttcn3-hacks/log_merge.sh SGSN_Tests --rm; \ + exit $exit_code -- cgit v1.2.3