Move unittest driver to utils/unittest/UnitTestMain.

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

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@81719 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Daniel Dunbar 2009-09-13 21:31:21 +00:00
parent f5382ab518
commit f845c74c62
4 changed files with 21 additions and 9 deletions

View File

@ -9,13 +9,6 @@
LEVEL = .. 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 PARALLEL_DIRS = ADT ExecutionEngine Support VMCore
include $(LEVEL)/Makefile.common include $(LEVEL)/Makefile.common

View File

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

View File

@ -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

View File

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