test build version mismatch reporting

Author: kripken

tests/test_sanity.py

@@ -242,6 +242,7 @@ def test_llvm_fastcomp(self):
     output = self.check_working(EMCC, 'did not see a source tree above or next to the LLVM root directory')
 
     VERSION_WARNING = 'Emscripten, llvm and clang repo versions do not match, this is dangerous'
+    BUILD_VERSION_WARNING = 'Emscripten, llvm and clang build versions do not match, this is dangerous'
 
     # add version number
     open(path_from_root('tests', 'fake', 'emscripten-version.txt'), 'w').write('waka')
@@ -263,6 +264,23 @@ def test_llvm_fastcomp(self):
     try_delete(SANITY_FILE)
     output = self.check_working(EMCC, VERSION_WARNING)
 
+    # restore clang version to ok, and fake the *build* versions
+    open(path_from_root('tests', 'fake', 'tools', 'clang', 'emscripten-version.txt'), 'w').write(EMSCRIPTEN_VERSION)
+    output = self.check_working(EMCC)
+    assert VERSION_WARNING not in output
+    fake = '#!/bin/sh\necho "clang version %s (blah blah) (emscripten waka : waka)"\necho "..."\n' % '.'.join(map(str, EXPECTED_LLVM_VERSION))
+    open(path_from_root('tests', 'fake', 'bin', 'clang'), 'w').write(fake)
+    open(path_from_root('tests', 'fake', 'bin', 'clang++'), 'w').write(fake)
+    os.chmod(path_from_root('tests', 'fake', 'bin', 'clang'), stat.S_IREAD | stat.S_IWRITE | stat.S_IEXEC)
+    os.chmod(path_from_root('tests', 'fake', 'bin', 'clang++'), stat.S_IREAD | stat.S_IWRITE | stat.S_IEXEC)
+    try_delete(SANITY_FILE)
+    output = self.check_working(EMCC, BUILD_VERSION_WARNING)
+    assert VERSION_WARNING not in output
+    # break clang repo version again, see it hides the build warning
+    open(path_from_root('tests', 'fake', 'tools', 'clang', 'emscripten-version.txt'), 'w').write('waka')
+    output = self.check_working(EMCC, VERSION_WARNING)
+    assert BUILD_VERSION_WARNING not in output
+
     restore()
 
     self.check_working([EMCC, 'tests/hello_world.cpp', '-s', 'ASM_JS=0'], '''Compiler settings are incompatible with fastcomp. You can fall back to the older compiler core, although that is not recommended''')