Skip to content

Commit

Permalink
Move unittest driver to utils/unittest/UnitTestMain.
Browse files Browse the repository at this point in the history
 - 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
  • Loading branch information
ddunbar committed Sep 13, 2009
1 parent f5382ab commit f845c74
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 9 deletions.
7 changes: 0 additions & 7 deletions unittests/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion utils/unittest/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
##===----------------------------------------------------------------------===##

LEVEL = ../..
PARALLEL_DIRS = googletest
PARALLEL_DIRS = googletest UnitTestMain

include $(LEVEL)/Makefile.common
19 changes: 19 additions & 0 deletions utils/unittest/UnitTestMain/Makefile
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//===--- unittests/TestMain.cpp - unittest driver -------------------------===//
//===--- utils/unittest/UnitTestMain/TestMain.cpp - unittest driver -------===//
//
// The LLVM Compiler Infrastructure
//
Expand Down

0 comments on commit f845c74

Please sign in to comment.