summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShawn Landden <slandden@gmail.com>2018-02-25 10:24:41 -0800
committerShawn Landden <slandden@gmail.com>2018-02-25 10:24:41 -0800
commit25f688e911b83c34fc1cecf5619bdbcc48075785 (patch)
tree5db45374d8c2e4de58663b02563ff20240fd1481
parentf6a6d7ac596eb9f4f8c69363f30f4988f38618b4 (diff)
downloaddistcc-git-25f688e911b83c34fc1cecf5619bdbcc48075785.tar.gz
test: fix compiler detection of clang
clang was detecting as gcc is gcc is installed, which broke CompilerOptionsPassed_Case when clang was set as cc
-rwxr-xr-xtest/testdistcc.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/test/testdistcc.py b/test/testdistcc.py
index 73d41e7..ef0e351 100755
--- a/test/testdistcc.py
+++ b/test/testdistcc.py
@@ -286,14 +286,14 @@ class SimpleDistCC_Case(comfychair.TestCase):
return None
def is_gcc(self, compiler):
- out, err = self.runcmd(compiler + " -v")
- if re.search('gcc', err) or re.search('gcc', out):
+ out, err = self.runcmd(compiler + " --version")
+ if re.search('Free Software Foundation', out):
return True
return False
def is_clang(self, compiler):
- out, err = self.runcmd(compiler + " -v")
- if re.search('clang', err) or re.search('clang', out):
+ out, err = self.runcmd(compiler + " --version")
+ if re.search('clang', out):
return True
return False