diff options
| author | Daniel Dunbar <daniel@zuster.org> | 2009-09-13 21:31:21 +0000 |
|---|---|---|
| committer | Daniel Dunbar <daniel@zuster.org> | 2009-09-13 21:31:21 +0000 |
| commit | f845c74c6243a10ee5df2af003dcf81bbd0b51a0 (patch) | |
| tree | 23caebb00abea9d6bb19051a271f0c69700b13fe | |
| parent | f5382ab5180c4051737367ed9cacbab697be29de (diff) | |
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
| -rw-r--r-- | unittests/Makefile | 7 | ||||
| -rw-r--r-- | utils/unittest/Makefile | 2 | ||||
| -rw-r--r-- | utils/unittest/UnitTestMain/Makefile | 19 | ||||
| -rw-r--r-- | utils/unittest/UnitTestMain/TestMain.cpp (renamed from unittests/TestMain.cpp) | 2 |
4 files changed, 21 insertions, 9 deletions
diff --git a/unittests/Makefile b/unittests/Makefile index b743838b86..6f4dae1055 100644 --- a/unittests/Makefile +++ b/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/utils/unittest/Makefile b/utils/unittest/Makefile index 2f3e601b41..6a09341832 100644 --- a/utils/unittest/Makefile +++ b/utils/unittest/Makefile @@ -8,6 +8,6 @@ ##===----------------------------------------------------------------------===## LEVEL = ../.. -PARALLEL_DIRS = googletest +PARALLEL_DIRS = googletest UnitTestMain include $(LEVEL)/Makefile.common diff --git a/utils/unittest/UnitTestMain/Makefile b/utils/unittest/UnitTestMain/Makefile new file mode 100644 index 0000000000..07a74e3c0d --- /dev/null +++ b/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 diff --git a/unittests/TestMain.cpp b/utils/unittest/UnitTestMain/TestMain.cpp index 095076b23e..d97dca872a 100644 --- a/unittests/TestMain.cpp +++ b/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 // |