5 files changed, 64 insertions, 0 deletions
diff --git a/clang-tools-extra/unittests/CMakeLists.txt b/clang-tools-extra/unittests/CMakeLists.txt
new file mode 100644
index 00000000000..444f9496750
--- /dev/null
+++ b/clang-tools-extra/unittests/CMakeLists.txt
@@ -0,0 +1,8 @@
+add_custom_target(ExtraToolsUnitTests)
+set_target_properties(ExtraToolsUnitTests PROPERTIES FOLDER "Extra Tools Unit Tests")
+
+function(add_extra_unittest test_dirname)
+  add_unittest(ExtraToolsUnitTests ${test_dirname} ${ARGN})
+endfunction()
+
+add_subdirectory(cpp11-migrate)
diff --git a/clang-tools-extra/unittests/Makefile b/clang-tools-extra/unittests/Makefile
new file mode 100644
index 00000000000..39e155afa8e
--- /dev/null
+++ b/clang-tools-extra/unittests/Makefile
@@ -0,0 +1,15 @@
+##===- tools/extra/test/Unit/Makefile ----------------------*- Makefile -*-===##
+#
+#                     The LLVM Compiler Infrastructure
+#
+# This file is distributed under the University of Illinois Open Source
+# License. See LICENSE.TXT for details.
+#
+##===----------------------------------------------------------------------===##
+
+CLANG_LEVEL := ../../..
+include $(CLANG_LEVEL)/../../Makefile.config
+
+PARALLEL_DIRS := cpp11-migrate
+
+include $(CLANG_LEVEL)/Makefile
diff --git a/clang-tools-extra/unittests/cpp11-migrate/CMakeLists.txt b/clang-tools-extra/unittests/cpp11-migrate/CMakeLists.txt
new file mode 100644
index 00000000000..da0eebeed42
--- /dev/null
+++ b/clang-tools-extra/unittests/cpp11-migrate/CMakeLists.txt
@@ -0,0 +1,13 @@
+set(LLVM_LINK_COMPONENTS
+  support
+  )
+
+add_extra_unittest(Cpp11MigrateTests
+  dummy.cpp)
+
+target_link_libraries(Cpp11MigrateTests
+  clangTooling
+  clangBasic
+  clangASTMatchers
+  )
+
diff --git a/clang-tools-extra/unittests/cpp11-migrate/Makefile b/clang-tools-extra/unittests/cpp11-migrate/Makefile
new file mode 100644
index 00000000000..46afa30571e
--- /dev/null
+++ b/clang-tools-extra/unittests/cpp11-migrate/Makefile
@@ -0,0 +1,22 @@
+##===- unittests/cpp11-migrate/Makefile --------------------*- Makefile -*-===##
+#
+#                     The LLVM Compiler Infrastructure
+#
+# This file is distributed under the University of Illinois Open Source
+# License. See LICENSE.TXT for details.
+#
+##===----------------------------------------------------------------------===##
+
+CLANG_LEVEL = ../../../..
+include $(CLANG_LEVEL)/../../Makefile.config
+
+TESTNAME = Cpp11MigrateTests
+LINK_COMPONENTS := asmparser bitreader support mc
+USEDLIBS = clangTooling.a clangFrontend.a clangSerialization.a clangDriver.a \
+		   clangRewriteFrontend.a clangRewriteCore.a clangParse.a \
+		   clangSema.a clangAnalysis.a \
+		   clangAST.a clangASTMatchers.a clangEdit.a clangLex.a clangBasic.a
+
+include $(CLANG_LEVEL)/Makefile
+MAKEFILE_UNITTEST_NO_INCLUDE_COMMON := 1
+include $(LLVM_SRC_ROOT)/unittests/Makefile.unittest
diff --git a/clang-tools-extra/unittests/cpp11-migrate/dummy.cpp b/clang-tools-extra/unittests/cpp11-migrate/dummy.cpp
new file mode 100644
index 00000000000..f837fa8c24f
--- /dev/null
+++ b/clang-tools-extra/unittests/cpp11-migrate/dummy.cpp
@@ -0,0 +1,6 @@
+#include "gtest/gtest.h"
+
+// FIXME: Replace this test with something more meaningful.
+TEST(SimpleTest, Test) {
+  ASSERT_TRUE(true);
+}