Index: test/libcxx/test/format.py
===================================================================
--- test/libcxx/test/format.py
+++ test/libcxx/test/format.py
@@ -65,9 +65,10 @@
 
     def _execute(self, test, lit_config):
         name = test.path_in_suite[-1]
-        is_sh_test = name.endswith('.sh.cpp')
-        is_pass_test = name.endswith('.pass.cpp')
-        is_fail_test = name.endswith('.fail.cpp')
+        name_root, name_ext = os.path.splitext(name)
+        is_sh_test = name_root.endswith('.sh')
+        is_pass_test = name_root.endswith('.pass')
+        is_fail_test = name_root.endswith('.fail')
 
         if test.config.unsupported:
             return (lit.Test.UNSUPPORTED,