not raising an exception if its a gcc proxied clang

Author: jakeret

hope/options.py

@@ -16,6 +16,7 @@
 LINUX_KEY = "Linux"
 
 #TODO: add check for other compilers
+GCC_CLANG_VERSION = "4.2.1" # always returned by clang -dumpversion
 MIN_GCC_VERSION = "4.7.0"
 SUPPORTED_VERSIONS = {"gcc": MIN_GCC_VERSION,
                       "gcc-linux": MIN_GCC_VERSION
@@ -79,8 +80,10 @@ def _check_version(compiler_name, compiler_exec):
     if compiler_name in SUPPORTED_VERSIONS.keys():
         import subprocess
         from distutils.version import StrictVersion
-        version = subprocess.check_output(compiler_exec + ' -dumpversion', shell=True).decode().rstrip()
-        if StrictVersion(version) < StrictVersion(SUPPORTED_VERSIONS[compiler_name]):
-            raise UnsupportedCompilerException("Compiler '%s' with version '%s' is not supported. Minimum version is '%s'"%(compiler_name, 
-                                                                                                                            version, 
-                                                                                                                            SUPPORTED_VERSIONS[compiler_name]))
+        sversion = subprocess.check_output(compiler_exec + ' -dumpversion', shell=True).decode().rstrip()
+        version = StrictVersion(sversion)
+        if version < StrictVersion(SUPPORTED_VERSIONS[compiler_name]):
+            if version != StrictVersion(GCC_CLANG_VERSION): # dont raise an exception if its gcc proxied clang
+                raise UnsupportedCompilerException("Compiler '%s' with version '%s' is not supported. Minimum version is '%s'"%(compiler_exec,
+                                                                                                                                sversion,
+                                                                                                                                SUPPORTED_VERSIONS[compiler_name]))

test/test_options.py

@@ -116,7 +116,27 @@ def test_get_cxxflags_invalid_compiler(self):
                     pytest.fail("Compiler is not supported")
                 except UnsupportedCompilerException:
                     assert True
-        
+
+    def test_get_cxxflags_gcc_clang(self):
+        compiler_name = "gcc"
+        with patch("platform.system") as sys_mock:
+            sys_mock.return_value = options.DARWIN_KEY
+            with patch("distutils.ccompiler.new_compiler") as new_cc_mock:
+                with patch("subprocess.check_output") as command_mock:
+                    command_mock.return_value = options.GCC_CLANG_VERSION.encode('utf-8')
+                    cc_mock = MagicMock()
+                    cc_mock.compiler = [compiler_name]
+                    new_cc_mock.return_value = cc_mock
+                    flags = get_cxxflags()
+                    assert flags is not None
+                    
+                    try:
+                        compiler = DARWIN_MAPPING[compiler_name]
+                    except KeyError:
+                        compiler = compiler_name
+                    
+                    assert map(eq, flags, options.CXX_FLAGS[compiler])
+
 if __name__ == '__main__':
     test = TestOptions()
     test.test_get_cxxflags_Darwin()