From e7bed74ae2a96169d512aba826aeb988d580bb15 Mon Sep 17 00:00:00 2001 From: Jon Turney Date: Mon, 8 Oct 2018 20:27:25 +0100 Subject: Fix a bug in test_compiler_detection AR wasn't reset in the environment, so this test could fail if more than one language compiler was specified in the environment and the linker wasn't 'ar' --- run_unittests.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/run_unittests.py b/run_unittests.py index b78088326..00bf5040e 100755 --- a/run_unittests.py +++ b/run_unittests.py @@ -1696,6 +1696,8 @@ class AllPlatformTests(BasePlatformTests): wrapperlinker_s += shlex.quote(w) + ' ' os.environ['AR'] = wrapperlinker_s wlinker = env.detect_static_linker(wcc) + # Pop it so we don't use it for the next detection + evalue = os.environ.pop('AR') # Must be the same type since it's a wrapper around the same exelist self.assertIs(type(cc), type(wcc)) self.assertIs(type(linker), type(wlinker)) -- cgit v1.2.3