Move unittest driver to utils/unittest/UnitTestMain.

- This eliminates a race between building the unittests and linking the
   UnitTestMain library.

llvm-svn: 81719

llvm/unittests/Makefile

@@ -9,13 +9,6 @@
 
 LEVEL = ..
 
-include $(LEVEL)/Makefile.config
-
-LIBRARYNAME = UnitTestMain
-BUILD_ARCHIVE = 1
-CPP.Flags += -I$(LLVM_SRC_ROOT)/utils/unittest/googletest/include
-CPP.Flags += -Wno-variadic-macros
-
 PARALLEL_DIRS = ADT ExecutionEngine Support VMCore
 
 include $(LEVEL)/Makefile.common

llvm/utils/unittest/Makefile

@@ -8,6 +8,6 @@
 ##===----------------------------------------------------------------------===##
 
 LEVEL = ../..
-PARALLEL_DIRS = googletest
+PARALLEL_DIRS = googletest UnitTestMain
 
 include $(LEVEL)/Makefile.common

llvm/utils/unittest/UnitTestMain/Makefile

@@ -0,0 +1,19 @@
+##===- utils/unittest/UnitTestMain/Makefile ----------------*- Makefile -*-===##
+#
+#                     The LLVM Compiler Infrastructure
+#
+# This file is distributed under the University of Illinois Open Source
+# License. See LICENSE.TXT for details.
+#
+##===----------------------------------------------------------------------===##
+
+LEVEL = ../../..
+
+include $(LEVEL)/Makefile.config
+
+LIBRARYNAME = UnitTestMain
+BUILD_ARCHIVE = 1
+CPP.Flags += -I$(LLVM_SRC_ROOT)/utils/unittest/googletest/include
+CPP.Flags += -Wno-variadic-macros
+
+include $(LEVEL)/Makefile.common

llvm/utils/unittest/UnitTestMain/TestMain.cpp

@@ -1,4 +1,4 @@
-//===--- unittests/TestMain.cpp - unittest driver -------------------------===//
+//===--- utils/unittest/UnitTestMain/TestMain.cpp - unittest driver -------===//
 //
 //                     The LLVM Compiler Infrastructure
 //