From a8c60d2d8f40d1eb59fc610ce21cc11c021f646c Mon Sep 17 00:00:00 2001 From: Daniel Krupp Date: Thu, 7 Dec 2023 16:41:48 +0100 Subject: [PATCH] The CC_ANALYZER_BIN test cases were too much env dependent --- analyzer/tests/unit/test_env_var.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/analyzer/tests/unit/test_env_var.py b/analyzer/tests/unit/test_env_var.py index ce171949e5..17b2077ff4 100644 --- a/analyzer/tests/unit/test_env_var.py +++ b/analyzer/tests/unit/test_env_var.py @@ -69,12 +69,12 @@ def test_CC_ANALYZER_BIN(self): machine is expected to run some version of gcc, so this should be OK. """ bin_gcc_var = self._get_analyzer_bin_for_CC_ANALYZER_BIN("gcc:gcc") - self.assertIn("gcc", bin_gcc_var) - self.assertNotIn("g++", bin_gcc_var) + self.assertTrue(bin_gcc_var.endswith("gcc")) + self.assertTrue(not bin_gcc_var.endswith("g++")) bin_gpp_var = self._get_analyzer_bin_for_CC_ANALYZER_BIN("gcc:g++") - self.assertIn("g++", bin_gpp_var) - self.assertNotIn("gcc", bin_gpp_var) + self.assertTrue(bin_gpp_var.endswith("g++")) + self.assertTrue(not bin_gpp_var.endswith("gcc")) self.assertNotEqual(bin_gcc_var, bin_gpp_var) @@ -88,11 +88,11 @@ def test_CC_ANALYZER_BIN_overrides_CC_ANALYZERS_FROM_PATH(self): context.analyzer_env["CC_ANALYZERS_FROM_PATH"] = '1' bin_gcc_var = self._get_analyzer_bin_for_CC_ANALYZER_BIN("gcc:gcc") - self.assertIn("gcc", bin_gcc_var) - self.assertNotIn("g++", bin_gcc_var) + self.assertTrue(bin_gcc_var.endswith("gcc")) + self.assertTrue(not bin_gcc_var.endswith("g++")) bin_gpp_var = self._get_analyzer_bin_for_CC_ANALYZER_BIN("gcc:g++") - self.assertIn("g++", bin_gpp_var) - self.assertNotIn("gcc", bin_gpp_var) + self.assertTrue(bin_gpp_var.endswith("g++")) + self.assertTrue(not bin_gpp_var.endswith("gcc")) self.assertNotEqual(bin_gcc_var, bin_gpp_var)