From d957616ba33b8682758cdcceb6fd0657a6b26186 Mon Sep 17 00:00:00 2001 From: Rudolf Hornig Date: Wed, 4 Dec 2024 09:33:49 +0100 Subject: [PATCH] simu5g: reverted the addition of omnetpp 6.1 for simu5g 1.2.2 They are not 100% compatible, see: https://github.com/omnetpp/omnetpp/discussions/1275#discussioncomment-11446469 --- opp_env/database/simu5g.py | 4 ++-- tests/smoketest_list_and_info | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/opp_env/database/simu5g.py b/opp_env/database/simu5g.py index 5d7d496b..3d64bc30 100644 --- a/opp_env/database/simu5g.py +++ b/opp_env/database/simu5g.py @@ -46,8 +46,8 @@ def get_simu5g_project_description(simu5g_version, inet_versions, omnetpp_versio def get_project_descriptions(): return [ get_simu5g_project_description(simu5g_version, inet_versions, omnetpp_versions) for simu5g_version, inet_versions, omnetpp_versions in [ - ["1.2.2", ["4.5.*"], ["6.1.*", "6.0.*"]], - ["1.2.1", ["4.4.*"], ["6.1.*", "6.0.*"]], + ["1.2.2", ["4.5.*"], ["6.0.*"]], + ["1.2.1", ["4.4.*"], ["6.0.*"]], # ["1.2.0", ["4.3.2"], ["6.0pre10"]], -- unavailable because OMNeT++ prereleases are not kept ["1.1.0", ["4.2.*"], ["5.6.*", "5.7.*"]], ["git", ["4.5.*"], ["6.0.*"]], diff --git a/tests/smoketest_list_and_info b/tests/smoketest_list_and_info index dd9232f8..986bd9a4 100755 --- a/tests/smoketest_list_and_info +++ b/tests/smoketest_list_and_info @@ -98,14 +98,14 @@ assert_contains_line 'inet-4.5.2 omnetpp-6.0.3' assert_contains_line 'inet-4.5.1 omnetpp-6.0.3' assert_contains_line 'inet-4.5.0 omnetpp-6.0.3' assert_contains_line 'inet-4.4.1 omnetpp-6.0.3' -assert_contains_line 'simu5g-1.2.2 inet-4.5.4 omnetpp-6.1.0' +assert_contains_line 'simu5g-1.2.2 inet-4.5.4 omnetpp-6.0.3' assert_contains_line 'simu5g-1.2.1 inet-4.4.1 omnetpp-6.0.3' assert_contains_line 'simu5g-1.1.0 inet-4.2.10 omnetpp-5.7.1' assert_not_contains ' omnetpp-6.0.2' # because it only offers the latest patchlevel of 6.0, 6.0.3 run opp_env list --expand simu5g assert_num_lines 4 6 -assert_contains_line 'simu5g-1.2.2 inet-4.5.4 omnetpp-6.1.0' +assert_contains_line 'simu5g-1.2.2 inet-4.5.4 omnetpp-6.0.3' assert_contains_line 'simu5g-1.2.1 inet-4.4.1 omnetpp-6.0.3' assert_contains_line 'simu5g-1.1.0 inet-4.2.10 omnetpp-5.7.1' assert_contains_line 'simu5g-git inet-4.5.4 omnetpp-6.0.3' @@ -125,7 +125,7 @@ assert_contains_line 'inet-4.5.0 omnetpp-6.0.3' run opp_env list --expand-all simu5g assert_num_lines 78 90 -assert_contains_line 'simu5g-1.2.2 inet-4.5.4 omnetpp-6.1.0' +assert_contains_line 'simu5g-1.2.2 inet-4.5.4 omnetpp-6.0.3' assert_contains_line 'simu5g-1.2.2 inet-4.5.1 omnetpp-6.0.3' assert_contains_line 'simu5g-1.2.2 inet-4.5.0 omnetpp-6.0.3' assert_contains_line 'simu5g-1.2.2 inet-4.5.2 omnetpp-6.0.2'