diff options
Diffstat (limited to 'llvm/unittests')
| -rw-r--r-- | llvm/unittests/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | llvm/unittests/MC/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | llvm/unittests/MC/StringTableBuilderTest.cpp (renamed from llvm/unittests/Object/StringTableBuilderTest.cpp) | 2 | ||||
| -rw-r--r-- | llvm/unittests/MC/YAMLTest.cpp (renamed from llvm/unittests/Object/YAMLTest.cpp) | 4 | ||||
| -rw-r--r-- | llvm/unittests/Makefile | 2 | ||||
| -rw-r--r-- | llvm/unittests/Object/CMakeLists.txt | 9 | ||||
| -rw-r--r-- | llvm/unittests/Object/Makefile | 15 |
7 files changed, 6 insertions, 29 deletions
diff --git a/llvm/unittests/CMakeLists.txt b/llvm/unittests/CMakeLists.txt index bbab2a12b53..65930b5e4a1 100644 --- a/llvm/unittests/CMakeLists.txt +++ b/llvm/unittests/CMakeLists.txt @@ -21,7 +21,6 @@ add_subdirectory(IR) add_subdirectory(LineEditor) add_subdirectory(Linker) add_subdirectory(MC) -add_subdirectory(Object) add_subdirectory(Option) add_subdirectory(Support) add_subdirectory(Transforms) diff --git a/llvm/unittests/MC/CMakeLists.txt b/llvm/unittests/MC/CMakeLists.txt index 496056ecf59..e2beab22ff9 100644 --- a/llvm/unittests/MC/CMakeLists.txt +++ b/llvm/unittests/MC/CMakeLists.txt @@ -4,4 +4,6 @@ set(LLVM_LINK_COMPONENTS add_llvm_unittest(MCTests MCAtomTest.cpp + StringTableBuilderTest.cpp + YAMLTest.cpp ) diff --git a/llvm/unittests/Object/StringTableBuilderTest.cpp b/llvm/unittests/MC/StringTableBuilderTest.cpp index 130eb4a3d73..d30dc6222d2 100644 --- a/llvm/unittests/Object/StringTableBuilderTest.cpp +++ b/llvm/unittests/MC/StringTableBuilderTest.cpp @@ -7,8 +7,8 @@ // //===----------------------------------------------------------------------===// +#include "llvm/MC/StringTableBuilder.h" #include "gtest/gtest.h" -#include "llvm/Object/StringTableBuilder.h" #include <string> using namespace llvm; diff --git a/llvm/unittests/Object/YAMLTest.cpp b/llvm/unittests/MC/YAMLTest.cpp index 1eb1113ae6b..09709ad73fc 100644 --- a/llvm/unittests/Object/YAMLTest.cpp +++ b/llvm/unittests/MC/YAMLTest.cpp @@ -7,14 +7,14 @@ // //===----------------------------------------------------------------------===// -#include "llvm/Object/YAML.h" +#include "llvm/MC/YAML.h" #include "llvm/Support/YAMLTraits.h" #include "gtest/gtest.h" using namespace llvm; struct BinaryHolder { - object::yaml::BinaryRef Binary; + yaml::BinaryRef Binary; }; namespace llvm { diff --git a/llvm/unittests/Makefile b/llvm/unittests/Makefile index 37f654065ce..603e7d58f8c 100644 --- a/llvm/unittests/Makefile +++ b/llvm/unittests/Makefile @@ -10,7 +10,7 @@ LEVEL = .. PARALLEL_DIRS = ADT Analysis Bitcode CodeGen DebugInfo ExecutionEngine IR \ - LineEditor Linker MC Object Option Support Transforms + LineEditor Linker MC Option Support Transforms include $(LEVEL)/Makefile.config include $(LLVM_SRC_ROOT)/unittests/Makefile.unittest diff --git a/llvm/unittests/Object/CMakeLists.txt b/llvm/unittests/Object/CMakeLists.txt deleted file mode 100644 index 580a894362d..00000000000 --- a/llvm/unittests/Object/CMakeLists.txt +++ /dev/null @@ -1,9 +0,0 @@ -set(LLVM_LINK_COMPONENTS - Object - Support - ) - -add_llvm_unittest(ObjectTests - StringTableBuilderTest.cpp - YAMLTest.cpp - ) diff --git a/llvm/unittests/Object/Makefile b/llvm/unittests/Object/Makefile deleted file mode 100644 index 9062149a24d..00000000000 --- a/llvm/unittests/Object/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -##===- unittests/Object/Makefile ---------------------------*- Makefile -*-===## -# -# The LLVM Compiler Infrastructure -# -# This file is distributed under the University of Illinois Open Source -# License. See LICENSE.TXT for details. -# -##===----------------------------------------------------------------------===## - -LEVEL = ../.. -TESTNAME = Object -LINK_COMPONENTS := object - -include $(LEVEL)/Makefile.config -include $(LLVM_SRC_ROOT)/unittests/Makefile.unittest |
