summaryrefslogtreecommitdiffstats
path: root/llvm/unittests
diff options
context:
space:
mode:
authorDaniel Dunbar <daniel@zuster.org>2009-09-13 21:31:21 +0000
committerDaniel Dunbar <daniel@zuster.org>2009-09-13 21:31:21 +0000
commit6be903e18588fe1c4666b93605dd8fa270a5b785 (patch)
tree2e2734d67247aad32cfc33f10a14e8897cacebb1 /llvm/unittests
parent51e72707b7b1258bf2a7811ee6d1557d735a58c9 (diff)
downloadbcm5719-llvm-6be903e18588fe1c4666b93605dd8fa270a5b785.tar.gz
bcm5719-llvm-6be903e18588fe1c4666b93605dd8fa270a5b785.zip
Move unittest driver to utils/unittest/UnitTestMain.
- This eliminates a race between building the unittests and linking the UnitTestMain library. llvm-svn: 81719
Diffstat (limited to 'llvm/unittests')
-rw-r--r--llvm/unittests/Makefile7
-rw-r--r--llvm/unittests/TestMain.cpp15
2 files changed, 0 insertions, 22 deletions
diff --git a/llvm/unittests/Makefile b/llvm/unittests/Makefile
index b743838b868..6f4dae1055c 100644
--- a/llvm/unittests/Makefile
+++ b/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
diff --git a/llvm/unittests/TestMain.cpp b/llvm/unittests/TestMain.cpp
deleted file mode 100644
index 095076b23ec..00000000000
--- a/llvm/unittests/TestMain.cpp
+++ /dev/null
@@ -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();
-}
OpenPOWER on IntegriCloud