Index: lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/Makefile
===================================================================
--- lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/Makefile
+++ lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/Makefile
@@ -4,4 +4,11 @@
 
 USE_LIBSTDCPP := 1
 
+# clang-3.5+ outputs FullDebugInfo by default for Darwin/FreeBSD
+# targets.  Other targets do not, which causes this test to fail.
+# This flag enables FullDebugInfo for all targets.
+ifneq (,$(findstring clang,$(CC)))
+  CFLAGS_EXTRAS += -fno-limit-debug-info
+endif
+
 include $(LEVEL)/Makefile.rules
Index: lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/TestDataFormatterStdMap.py
===================================================================
--- lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/TestDataFormatterStdMap.py
+++ lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/TestDataFormatterStdMap.py
@@ -24,10 +24,6 @@
     @expectedFailureIcc   # llvm.org/pr15301: LLDB prints incorrect size of
                           # libstdc++ containers
     @skipIfFreeBSD
-    @skipIfLinux # non-core functionality, need to reenable and fix
-                 # later (DES 2014.11.07). Most likely failing because
-                 # of mis-match is version of libstdc++ supported by
-                 # the data-formatters.
     @dwarf_test
     def test_with_dwarf_and_run_command(self):
         """Test data formatter commands."""