From 76eca4dcd8d7c753b57443f4155e0bff79e1e742 Mon Sep 17 00:00:00 2001
From: Harald Welte <laforge@osmocom.org>
Date: Thu, 4 Feb 2021 10:34:21 +0100
Subject: [PATCH] fr-net: Don't generate junit-xml output. It's not a test
 suite

Change-Id: Id296e62fb86731492d42370173a48f217b2fbdc0
---
 fr-net/FRNET_Tests.cfg     |  6 ++++--
 fr-net/FRNET_Tests.default | 14 ++++++++++----
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/fr-net/FRNET_Tests.cfg b/fr-net/FRNET_Tests.cfg
index dedd82836..555b260ef 100644
--- a/fr-net/FRNET_Tests.cfg
+++ b/fr-net/FRNET_Tests.cfg
@@ -1,6 +1,8 @@
 [ORDERED_INCLUDE]
-# Common configuration, shared between test suites
-"../Common.cfg"
+# We cannot include Common.cfg, as this includes the LoggerPlugins configuration
+# for junit-xml generation.  However, we don't want to generate any junit-xml,
+# as FRNET_Tests really is not a test suite, but just a stub against which FR_Tests
+# can execute
 # testsuite specific configuration, not expected to change
 "./FRNET_Tests.default"
 
diff --git a/fr-net/FRNET_Tests.default b/fr-net/FRNET_Tests.default
index d694d98ef..9ec4a0c52 100644
--- a/fr-net/FRNET_Tests.default
+++ b/fr-net/FRNET_Tests.default
@@ -1,10 +1,16 @@
 [ORDERED_INCLUDE]
-# Common configuration, shared between test suites
-"../Common.cfg"
+# We cannot include Common.cfg, as this includes the LoggerPlugins configuration
+# for junit-xml generation.  However, we don't want to generate any junit-xml,
+# as FRNET_Tests really is not a test suite, but just a stub against which FR_Tests
+# can execute
 
 [LOGGING]
-#*.FileMask := LOG_ALL
-ConsoleMask := ERROR | WARNING | TESTCASE | TIMEROP_START | USER
+LogFile := "%e-%c-%h-%r.%s"
+AppendFile := Yes;
+SourceInfoFormat := Single;
+LogSourceInfo := Yes;
+FileMask := LOG_ALL | TTCN_DEBUG | TTCN_MATCHING | DEBUG_ENCDEC;
+ConsoleMask := ERROR | WARNING | TESTCASE | USER | VERDICTOP;
 
 [MODULE_PARAMETERS]