[llvm-commits] [llvm] r81719 - in /llvm/trunk: unittests/Makefile unittests/TestMain.cpp utils/unittest/Makefile utils/unittest/UnitTestMain/ utils/unittest/UnitTestMain/Makefile utils/unittest/UnitTestMain/TestMain.cpp

[Daniel Dunbar]

Author: ddunbar
Date: Sun Sep 13 16:31:21 2009
New Revision: 81719

URL: http://llvm.org/viewvc/llvm-project?rev=81719&view=rev
Log:
Move unittest driver to utils/unittest/UnitTestMain.
 - This eliminates a race between building the unittests and linking the
   UnitTestMain library.

Added:
    llvm/trunk/utils/unittest/UnitTestMain/
    llvm/trunk/utils/unittest/UnitTestMain/Makefile
      - copied, changed from r81718, llvm/trunk/unittests/Makefile
    llvm/trunk/utils/unittest/UnitTestMain/TestMain.cpp
      - copied, changed from r81718, llvm/trunk/unittests/TestMain.cpp
Removed:
    llvm/trunk/unittests/TestMain.cpp
Modified:
    llvm/trunk/unittests/Makefile
    llvm/trunk/utils/unittest/Makefile

Modified: llvm/trunk/unittests/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/Makefile?rev=81719&r1=81718&r2=81719&view=diff

==============================================================================
--- llvm/trunk/unittests/Makefile (original)
+++ llvm/trunk/unittests/Makefile Sun Sep 13 16:31:21 2009
@@ -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

Removed: llvm/trunk/unittests/TestMain.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/TestMain.cpp?rev=81718&view=auto

==============================================================================
--- llvm/trunk/unittests/TestMain.cpp (original)
+++ llvm/trunk/unittests/TestMain.cpp (removed)
@@ -1,15 +0,0 @@
-//===--- unittests/TestMain.cpp - unittest driver -------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#include "gtest/gtest.h"
-
-int main(int argc, char **argv) {
-  testing::InitGoogleTest(&argc, argv);
-  return RUN_ALL_TESTS();
-}

Modified: llvm/trunk/utils/unittest/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/unittest/Makefile?rev=81719&r1=81718&r2=81719&view=diff

==============================================================================
--- llvm/trunk/utils/unittest/Makefile (original)
+++ llvm/trunk/utils/unittest/Makefile Sun Sep 13 16:31:21 2009
@@ -8,6 +8,6 @@
 ##===----------------------------------------------------------------------===##
 
 LEVEL = ../..
-PARALLEL_DIRS = googletest
+PARALLEL_DIRS = googletest UnitTestMain
 
 include $(LEVEL)/Makefile.common

Copied: llvm/trunk/utils/unittest/UnitTestMain/Makefile (from r81718, llvm/trunk/unittests/Makefile)
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/unittest/UnitTestMain/Makefile?p2=llvm/trunk/utils/unittest/UnitTestMain/Makefile&p1=llvm/trunk/unittests/Makefile&r1=81718&r2=81719&rev=81719&view=diff

==============================================================================
--- llvm/trunk/unittests/Makefile (original)
+++ llvm/trunk/utils/unittest/UnitTestMain/Makefile Sun Sep 13 16:31:21 2009
@@ -1,4 +1,4 @@
-##===- unittests/Makefile ----------------------------------*- Makefile -*-===##
+##===- utils/unittest/UnitTestMain/Makefile ----------------*- Makefile -*-===##
 #
 #                     The LLVM Compiler Infrastructure
 #
@@ -7,7 +7,7 @@
 #
 ##===----------------------------------------------------------------------===##
 
-LEVEL = ..
+LEVEL = ../../..
 
 include $(LEVEL)/Makefile.config
 
@@ -16,9 +16,4 @@
 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
-
-clean::
-	$(Verb) $(RM) -f *Tests

Copied: llvm/trunk/utils/unittest/UnitTestMain/TestMain.cpp (from r81718, llvm/trunk/unittests/TestMain.cpp)
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/unittest/UnitTestMain/TestMain.cpp?p2=llvm/trunk/utils/unittest/UnitTestMain/TestMain.cpp&p1=llvm/trunk/unittests/TestMain.cpp&r1=81718&r2=81719&rev=81719&view=diff

==============================================================================
--- llvm/trunk/unittests/TestMain.cpp (original)
+++ llvm/trunk/utils/unittest/UnitTestMain/TestMain.cpp Sun Sep 13 16:31:21 2009
@@ -1,4 +1,4 @@
-//===--- unittests/TestMain.cpp - unittest driver -------------------------===//
+//===--- utils/unittest/UnitTestMain/TestMain.cpp - unittest driver -------===//
 //
 //                     The LLVM Compiler Infrastructure
 //