Index: libcxx/trunk/CMakeLists.txt
===================================================================
--- libcxx/trunk/CMakeLists.txt
+++ libcxx/trunk/CMakeLists.txt
@@ -81,6 +81,7 @@
     ${ENABLE_FILESYSTEM_DEFAULT})
 option(LIBCXX_INCLUDE_TESTS "Build the libc++ tests." ${LLVM_INCLUDE_TESTS})
 option(LIBCXX_ENABLE_PARALLEL_ALGORITHMS "Enable the parallel algorithms library. This requires the PSTL to be available." OFF)
+option(LIBCXX_TEST_GDB_PRETTY_PRINTERS "Test gdb pretty printers." OFF)
 
 # Benchmark options -----------------------------------------------------------
 option(LIBCXX_INCLUDE_BENCHMARKS "Build the libc++ benchmarks and their dependencies" ON)
Index: libcxx/trunk/test/CMakeLists.txt
===================================================================
--- libcxx/trunk/test/CMakeLists.txt
+++ libcxx/trunk/test/CMakeLists.txt
@@ -60,12 +60,16 @@
   message(FATAL_ERROR "Expected LIBCXX_TEST_DEPS to be defined")
 endif()
 
-find_program(LIBCXX_GDB gdb)
-if (LIBCXX_GDB)
-  set(LIBCXX_GDB "${LIBCXX_GDB}")
-  message(STATUS "gdb found: ${LIBCXX_GDB}")
-else()
-  message(STATUS "gdb not found. Disabling dependent tests.")
+# Turn this on by default when the pretty printers are python3
+# compatible.
+if(LIBCXX_TEST_GDB_PRETTY_PRINTERS)
+  find_program(LIBCXX_GDB gdb)
+  if (LIBCXX_GDB)
+    set(LIBCXX_GDB "${LIBCXX_GDB}")
+    message(STATUS "gdb found: ${LIBCXX_GDB}")
+  else()
+    message(STATUS "gdb not found. Disabling dependent tests.")
+  endif()
 endif()
 
 if (LIBCXX_INCLUDE_TESTS)