From 99ca30ce2e602e15fff939cb7076ba594fae7631 Mon Sep 17 00:00:00 2001
From: Harald Welte <laforge@gnumonks.org>
Date: Tue, 13 Mar 2018 13:11:09 +0000
Subject: [PATCH] remove *.default from [EXECUTE] in *.default files

The problem is that the .cfg file cannot override the [EXECUTE]
provided list of tests

Change-Id: I7e1e0499b3b32014b25ae4b515263f57a4ea6daf
---
 bsc/BSC_Tests.cfg             | 2 +-
 bsc/BSC_Tests.default         | 1 -
 bts/BTS_Tests.default         | 1 -
 ggsn_tests/GGSN_Tests.cfg     | 1 +
 ggsn_tests/GGSN_Tests.default | 1 -
 hlr/HLR_Tests.cfg             | 1 +
 hlr/HLR_Tests.default         | 1 -
 mgw/MGCP_Test.cfg             | 1 +
 mgw/MGCP_Test.default         | 1 -
 msc/MSC_Tests.cfg             | 1 +
 msc/MSC_Tests.default         | 1 -
 sgsn/SGSN_Tests.default       | 1 -
 12 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/bsc/BSC_Tests.cfg b/bsc/BSC_Tests.cfg
index 217c367f1..ef6823cb6 100644
--- a/bsc/BSC_Tests.cfg
+++ b/bsc/BSC_Tests.cfg
@@ -15,7 +15,7 @@
 [MAIN_CONTROLLER]
 
 [EXECUTE]
-#BSC_Tests.control
+BSC_Tests.control
 #BSC_Tests.TC_chan_act_noreply
 #BSC_Tests.TC_chan_act_ack_noest
 #BSC_Tests.TC_chan_act_ack_est_ind_noreply
diff --git a/bsc/BSC_Tests.default b/bsc/BSC_Tests.default
index baa3b549a..19c0c8c01 100644
--- a/bsc/BSC_Tests.default
+++ b/bsc/BSC_Tests.default
@@ -20,4 +20,3 @@ mtc.FileMask := LOG_ALL | TTCN_DEBUG | TTCN_MATCHING | DEBUG_ENCDEC;
 Osmocom_VTY_Functions.mp_prompt_prefix := "OsmoBSC";
 
 [EXECUTE]
-BSC_Tests.control
diff --git a/bts/BTS_Tests.default b/bts/BTS_Tests.default
index fa8d0b0d0..196d088fa 100644
--- a/bts/BTS_Tests.default
+++ b/bts/BTS_Tests.default
@@ -19,4 +19,3 @@ mtc.FileMask := LOG_ALL | TTCN_DEBUG | TTCN_MATCHING | DEBUG_ENCDEC;
 Osmocom_VTY_Functions.mp_prompt_prefix := "OsmoBTS";
 
 [EXECUTE]
-BTS_Tests.control
diff --git a/ggsn_tests/GGSN_Tests.cfg b/ggsn_tests/GGSN_Tests.cfg
index b7c098882..e849ed45d 100644
--- a/ggsn_tests/GGSN_Tests.cfg
+++ b/ggsn_tests/GGSN_Tests.cfg
@@ -15,3 +15,4 @@
 [MODULE_PARAMETERS]
 
 [EXECUTE]
+GGSN_Tests.control
diff --git a/ggsn_tests/GGSN_Tests.default b/ggsn_tests/GGSN_Tests.default
index 7b9fe6976..2d57f8979 100644
--- a/ggsn_tests/GGSN_Tests.default
+++ b/ggsn_tests/GGSN_Tests.default
@@ -13,4 +13,3 @@ GGSN_Tests.m_ggsn_ip6_dns1 := "2001:4860:4860::8888"
 GGSN_Tests.m_ggsn_ip6_dns2 := "2001:4860:4860::8844"
 
 [EXECUTE]
-GGSN_Tests.control
diff --git a/hlr/HLR_Tests.cfg b/hlr/HLR_Tests.cfg
index 98b9e2731..7416362db 100644
--- a/hlr/HLR_Tests.cfg
+++ b/hlr/HLR_Tests.cfg
@@ -16,3 +16,4 @@
 [MAIN_CONTROLLER]
 
 [EXECUTE]
+HLR_Tests.control
diff --git a/hlr/HLR_Tests.default b/hlr/HLR_Tests.default
index 91d5454f3..f45847926 100644
--- a/hlr/HLR_Tests.default
+++ b/hlr/HLR_Tests.default
@@ -15,4 +15,3 @@ mtc.FileMask := LOG_ALL | TTCN_DEBUG | TTCN_MATCHING; // | DEBUG_ENCDEC;
 Osmocom_VTY_Functions.mp_prompt_prefix := "OsmoHLR";
 
 [EXECUTE]
-HLR_Tests.control
diff --git a/mgw/MGCP_Test.cfg b/mgw/MGCP_Test.cfg
index b936fe1e0..0cca79ee2 100644
--- a/mgw/MGCP_Test.cfg
+++ b/mgw/MGCP_Test.cfg
@@ -15,6 +15,7 @@
 [MAIN_CONTROLLER]
 
 [EXECUTE]
+MGCP_Test.control
 #MGCP_Test.TC_selftest
 ##MGCP_Test.TC_crcx
 #MGCP_Test.TC_crcx_noprefix
diff --git a/mgw/MGCP_Test.default b/mgw/MGCP_Test.default
index c9d61293b..16027cc8b 100644
--- a/mgw/MGCP_Test.default
+++ b/mgw/MGCP_Test.default
@@ -12,4 +12,3 @@ mp_remote_ip:= "127.0.0.1";
 [MAIN_CONTROLLER]
 
 [EXECUTE]
-MGCP_Test.control
diff --git a/msc/MSC_Tests.cfg b/msc/MSC_Tests.cfg
index 6fb3523c3..a1f13322e 100644
--- a/msc/MSC_Tests.cfg
+++ b/msc/MSC_Tests.cfg
@@ -15,6 +15,7 @@
 [MAIN_CONTROLLER]
 
 [EXECUTE]
+MSC_Tests.control
 #MSC_Tests.TC_reset
 #MSC_Tests.TC_cmserv_imsi_unknown
 #MSC_Tests.TC_lu_imsi_noauth_tmsi
diff --git a/msc/MSC_Tests.default b/msc/MSC_Tests.default
index 6c3e29c76..eff5d9688 100644
--- a/msc/MSC_Tests.default
+++ b/msc/MSC_Tests.default
@@ -37,4 +37,3 @@ Osmocom_VTY_Functions.mp_prompt_prefix := "OsmoMSC";
 [MAIN_CONTROLLER]
 
 [EXECUTE]
-MSC_Tests.control
diff --git a/sgsn/SGSN_Tests.default b/sgsn/SGSN_Tests.default
index 6d120fb17..67a80321b 100644
--- a/sgsn/SGSN_Tests.default
+++ b/sgsn/SGSN_Tests.default
@@ -30,4 +30,3 @@ Osmocom_VTY_Functions.mp_prompt_prefix := "OsmoSGSN";
 [MAIN_CONTROLLER]
 
 [EXECUTE]
-SGSN_Tests.control