From d5c425bcf77a13480e157cec38dbe1566427c1bf Mon Sep 17 00:00:00 2001 From: Gabriel Ferreira Date: Tue, 25 Oct 2022 11:45:58 -0300 Subject: [PATCH] build: remove MPI_CI environment variable from test-ns3.py test case --- utils/tests/test-ns3.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/utils/tests/test-ns3.py b/utils/tests/test-ns3.py index aafde1981..ca9db15d6 100755 --- a/utils/tests/test-ns3.py +++ b/utils/tests/test-ns3.py @@ -1209,10 +1209,10 @@ class NS3ConfigureTestCase(NS3BaseTestCase): self.assertIn("mpiexec -np 2 %s" % sample_simulator_path, stdout) # Get the commands to run sample-simulator in two processes with mpi, now with the environment variable - return_code, stdout, stderr = run_ns3(mpi_command, env={"MPI_CI": "1"}) + return_code, stdout, stderr = run_ns3(mpi_command) self.assertEqual(return_code, 0) if os.getenv("USER", "") == "root": - if shutil.which("ompi_info") and os.cpu_count() < 2: + if shutil.which("ompi_info"): self.assertIn("mpiexec --allow-run-as-root --oversubscribe -np 2 %s" % sample_simulator_path, stdout) else: self.assertIn("mpiexec --allow-run-as-root -np 2 %s" % sample_simulator_path, stdout) @@ -1225,7 +1225,7 @@ class NS3ConfigureTestCase(NS3BaseTestCase): self.assertIn("echo %s" % sample_simulator_path, stdout) # Again the non-mpi command, with the MPI_CI environment variable set - return_code, stdout, stderr = run_ns3(non_mpi_command, env={"MPI_CI": "1"}) + return_code, stdout, stderr = run_ns3(non_mpi_command) self.assertEqual(return_code, 0) self.assertIn("echo %s" % sample_simulator_path, stdout)