delete /dev/null redirection from other smoke test commands

omnetpp · Oct 12, 2024 · 5e516c7 · 5e516c7
1 parent 1a14cb4
commit 5e516c7
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/opp_env/database/inet.py b/opp_env/database/inet.py
@@ -113,8 +113,8 @@ def make_inet_project_description(inet_version, omnetpp_versions):
             "cd examples/ethernet/arptest",
             """if [ "$mode" = "debug" ]; then DBG_SUFFIX="_dbg"; INET_LIB=$(echo $INET_ROOT/out/*-debug/src/*INET*); fi""",
             """if [ "$mode" = "release" ]; then DBG_SUFFIX=""; INET_LIB=$(echo $INET_ROOT/out/*-release/src/*INET*); fi""",
-            "opp_run$DBG_SUFFIX -l $INET_LIB -n $INET_ROOT/tutorials:$INET_ROOT/examples:.:$INET_ROOT/src -c ARPTest -u Cmdenv --sim-time-limit=10s > /dev/null" if inet_version < "4.0" else
-            "inet$DBG_SUFFIX -c ARPTest -u Cmdenv --sim-time-limit=10s >/dev/null"
+            "opp_run$DBG_SUFFIX -l $INET_LIB -n $INET_ROOT/tutorials:$INET_ROOT/examples:.:$INET_ROOT/src -c ARPTest -u Cmdenv --sim-time-limit=10s" if inet_version < "4.0" else
+            "inet$DBG_SUFFIX -c ARPTest -u Cmdenv --sim-time-limit=10s"
         ],
         "test_commands": [
             "cd tests/fingerprint && ./fingerprinttest",

diff --git a/opp_env/database/omnetpp.py b/opp_env/database/omnetpp.py
@@ -265,8 +265,8 @@ def make_omnetpp_project_description(version, base_version=None, is_modernized=F
         ],
         "smoke_test_commands": [
             """if [ "$BUILD_MODE" = "debug" ]; then DEBUG_SUFFIX="_dbg"; fi """ if base_version >= "5.2" else None,
-            "nedtool -h >/dev/null" if base_version.startswith("3.") else
-            "cd samples/dyna; ./dyna$DEBUG_SUFFIX -u Cmdenv >/dev/null"
+            "nedtool -h" if base_version.startswith("3.") else
+            "cd samples/dyna; ./dyna$DEBUG_SUFFIX -u Cmdenv"
         ],
         "test_commands": [
             None if base_version < "6.0" else

diff --git a/opp_env/database/simu5g.py b/opp_env/database/simu5g.py
@@ -14,7 +14,7 @@ def get_simu5g_project_description(simu5g_version, inet_versions, omnetpp_versio
             "SIMU5G_EMULATION_ROOT=$SIMU5G_ROOT/emulation" if simu5g_version >= "1.2.1" else "",
             """if [ "$BUILD_MODE" = "debug" ]; then BUILD_MODE_SUFFIX="_dbg"; fi""",
             """if [ "$BUILD_MODE" = "release" ]; then BUILD_MODE_SUFFIX=""; fi""",
-            "opp_run$BUILD_MODE_SUFFIX -l $SIMU5G_ROOT/src/simu5g -l $INET_ROOT/src/INET -n $SIMU5G_ROOT/simulations:$SIMU5G_EMULATION_ROOT:$SIMU5G_ROOT/src:$INET_ROOT/src -c VideoStreaming -r 0 -u Cmdenv --sim-time-limit=10s > /dev/null",
+            "opp_run$BUILD_MODE_SUFFIX -l $SIMU5G_ROOT/src/simu5g -l $INET_ROOT/src/INET -n $SIMU5G_ROOT/simulations:$SIMU5G_EMULATION_ROOT:$SIMU5G_ROOT/src:$INET_ROOT/src -c VideoStreaming -r 0 -u Cmdenv --sim-time-limit=10s",
         ],
         "patch_commands": [
             "sed -i -E 's|-KINET_PROJ=[^ ]+|-KINET_PROJ=$(INET_ROOT)|' Makefile",

diff --git a/opp_env/database/simulte.py b/opp_env/database/simulte.py
@@ -15,7 +15,7 @@ def get_simulte_project_description(simulte_version, inet_versions, omnetpp_vers
             """if [ "$BUILD_MODE" = "debug" ]; then BUILD_MODE_SUFFIX="_dbg"; fi""" if simulte_version >= "1.1.0" else """if [ "$BUILD_MODE" = "debug" ]; then BUILD_MODE_SUFFIX=""; fi""",
             """if [ "$BUILD_MODE" = "release" ]; then SIMULTE_LIB=$(echo $SIMULTE_ROOT/out/*-release/src/*lte*); BUILD_MODE_SUFFIX=""; fi""",
             """if [ "$BUILD_MODE" = "release" ]; then BUILD_MODE_SUFFIX=""; fi""" if simulte_version >= "1.1.0" else """if [ "$BUILD_MODE" = "release" ]; then BUILD_MODE_SUFFIX="_release"; fi""",
-            "opp_run$BUILD_MODE_SUFFIX -l $SIMULTE_LIB -n $SIMULTE_ROOT/simulations:$SIMULTE_ROOT/src:$INET_ROOT/src -c VideoStreaming -r 0 -u Cmdenv --sim-time-limit=10s > /dev/null"
+            "opp_run$BUILD_MODE_SUFFIX -l $SIMULTE_LIB -n $SIMULTE_ROOT/simulations:$SIMULTE_ROOT/src:$INET_ROOT/src -c VideoStreaming -r 0 -u Cmdenv --sim-time-limit=10s"
         ],
         "patch_commands": [
             "sed -i -E 's|-KINET_PROJ=[^ ]+|-KINET_PROJ=$(INET_ROOT)|' Makefile",

diff --git a/opp_env/database/veins.py b/opp_env/database/veins.py
@@ -27,9 +27,9 @@ def make_veins_project_description(veins_version, inet_versions, sumo_version, o
             """if [ "$BUILD_MODE" = "debug" ]; then DEBUG_POSTFIX="-d"; fi""",
             """if [ "$BUILD_MODE" = "release" ]; then DEBUG_POSTFIX=""; fi""",
             "./sumo-launchd.py &> /dev/null & bg_pid=$! &> /dev/null",
-            "cd examples/veins && ./run $DEBUG_POSTFIX -c Default -u Cmdenv > /dev/null",
+            "cd examples/veins && ./run $DEBUG_POSTFIX -c Default -u Cmdenv",
             "export VEINS_INET_INI_CONFIG='-c plain'" if veins_version >= "5.1" else "",
-            "if [[ ! ($INET_VERSION < '4.0.0') ]]; then cd ../../subprojects/veins_inet/examples/veins_inet && ./run $DEBUG_POSTFIX $VEINS_INET_INI_CONFIG -u Cmdenv > /dev/null; else cd ../../subprojects/veins_inet3/examples/veins_inet && ./run $DEBUG_POSTFIX -u Cmdenv > /dev/null; fi",
+            "if [[ ! ($INET_VERSION < '4.0.0') ]]; then cd ../../subprojects/veins_inet/examples/veins_inet && ./run $DEBUG_POSTFIX $VEINS_INET_INI_CONFIG -u Cmdenv; else cd ../../subprojects/veins_inet3/examples/veins_inet && ./run $DEBUG_POSTFIX -u Cmdenv; fi",
             "kill $bg_pid &> /dev/null",
         ] if veins_version >= "5.0" else ["echo 'Skipping test because required sumo version is not available as a nix package.'"],
         "build_commands": [