aboutsummaryrefslogtreecommitdiffstats
path: root/ttcn3-nitb-sysinfo
diff options
context:
space:
mode:
authorPau Espin Pedrol <pespin@sysmocom.de>2018-07-06 14:47:28 +0200
committerPau Espin Pedrol <pespin@sysmocom.de>2018-07-06 14:50:47 +0200
commit618505f98fec31253f528f81a6bf2f5a564005f9 (patch)
tree06d1f0d560e6a5fbdb3ca97859a2e91277a7ab33 /ttcn3-nitb-sysinfo
parent307106783eba0ec018deff092c1d0d993f95a76d (diff)
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
Diffstat (limited to 'ttcn3-nitb-sysinfo')
-rw-r--r--ttcn3-nitb-sysinfo/Dockerfile6
1 files changed, 4 insertions, 2 deletions
diff --git a/ttcn3-nitb-sysinfo/Dockerfile b/ttcn3-nitb-sysinfo/Dockerfile
index fb5ceb2..39860f2 100644
--- a/ttcn3-nitb-sysinfo/Dockerfile
+++ b/ttcn3-nitb-sysinfo/Dockerfile
@@ -20,5 +20,7 @@ VOLUME /data
COPY Test.cfg /data/Test.cfg
CMD cd /data && \
- /osmo-ttcn3-hacks/start-testsuite.sh /osmo-ttcn3-hacks/sysinfo/Test && \
- /osmo-ttcn3-hacks/log_merge.sh Test
+ /osmo-ttcn3-hacks/start-testsuite.sh /osmo-ttcn3-hacks/sysinfo/Test; \
+ exit_code=$?; \
+ /osmo-ttcn3-hacks/log_merge.sh Test; \
+ exit $exit_code