aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2013-11-25 10:28:33 -0800
committerAlon Zakai <alonzakai@gmail.com>2013-11-25 10:28:33 -0800
commitda23764aa8d5bfe3189cd5c472363fc298b6d5b2 (patch)
tree85e706b99eca5c5e6fb37085ab97e08ff0042525
parentd84cdea93caf240a03331ac876ad9ad82bc33d65 (diff)
support C/C++ suffixes in capital form
-rwxr-xr-xemcc5
-rw-r--r--tests/test_other.py5
2 files changed, 8 insertions, 2 deletions
diff --git a/emcc b/emcc
index 6a483a39..029d60a1 100755
--- a/emcc
+++ b/emcc
@@ -53,8 +53,9 @@ from tools import shared, jsrun
from tools.shared import Compression, execute, suffix, unsuffixed, unsuffixed_basename, WINDOWS
from tools.response_file import read_response_file
-CXX_SUFFIXES = ('.cpp', '.cxx', '.cc')
-SOURCE_SUFFIXES = ('.c', '.cpp', '.cxx', '.cc', '.m', '.mm')
+C_SUFFIXES = ('.c', '.C')
+CXX_SUFFIXES = ('.cpp', '.cxx', '.cc', '.CPP', '.CXX', '.CC')
+SOURCE_SUFFIXES = C_SUFFIXES + CXX_SUFFIXES + ('.m', '.mm')
BITCODE_SUFFIXES = ('.bc', '.o', '.obj')
DYNAMICLIB_SUFFIXES = ('.dylib', '.so', '.dll')
STATICLIB_SUFFIXES = ('.a',)
diff --git a/tests/test_other.py b/tests/test_other.py
index 5a76bf6a..5100db72 100644
--- a/tests/test_other.py
+++ b/tests/test_other.py
@@ -371,6 +371,11 @@ f.close()
process.communicate()
assert process.returncode is 0, 'User should be able to specify custom -std= on the command line!'
+ def test_cap_suffixes(self):
+ shutil.copyfile(path_from_root('tests', 'hello_world.cpp'), 'test.CPP')
+ Popen([PYTHON, EMCC, os.path.join(self.get_dir(), 'test.CPP')]).communicate()
+ self.assertContained('hello, world!', run_js(os.path.join(self.get_dir(), 'a.out.js')))
+
def test_catch_undef(self):
open(os.path.join(self.get_dir(), 'test.cpp'), 'w').write(r'''
#include <vector>