Index: cfe/trunk/test/Tooling/clang-check-mac-libcxx-fixed-compilation-db.cpp
===================================================================
--- cfe/trunk/test/Tooling/clang-check-mac-libcxx-fixed-compilation-db.cpp
+++ cfe/trunk/test/Tooling/clang-check-mac-libcxx-fixed-compilation-db.cpp
@@ -16,5 +16,7 @@
 //
 // ^ -ccc-install-dir passed to unbreak tests on *BSD where
 //   getMainExecutable() relies on real argv[0] being passed
+//
+// UNSUPPORTED: enable_shared
 #include <mock_vector>
 vector v;
Index: llvm/trunk/utils/lit/lit/llvm/config.py
===================================================================
--- llvm/trunk/utils/lit/lit/llvm/config.py
+++ llvm/trunk/utils/lit/lit/llvm/config.py
@@ -48,6 +48,8 @@
             # We should standardize on the former.
             features.add('system-linker-mach-o')
             features.add('system-darwin')
+            if config.enable_shared:
+                features.add("enable_shared")
         elif platform.system() == 'Windows':
             # For tests that require Windows to run.
             features.add('system-windows')