aboutsummaryrefslogtreecommitdiffstats
path: root/unittests
diff options
context:
space:
mode:
authorMichael J. Spencer <bigcheesegs@gmail.com>2010-11-29 18:16:10 +0000
committerMichael J. Spencer <bigcheesegs@gmail.com>2010-11-29 18:16:10 +0000
commit1f6efa3996dd1929fbc129203ce5009b620e6969 (patch)
tree6b782914982f90d3a983bcefef98b8ef68ab2961 /unittests
parent9363f739cdc3bd02e8516a25de0090f52ae12fbb (diff)
downloadexternal_llvm-1f6efa3996dd1929fbc129203ce5009b620e6969.zip
external_llvm-1f6efa3996dd1929fbc129203ce5009b620e6969.tar.gz
external_llvm-1f6efa3996dd1929fbc129203ce5009b620e6969.tar.bz2
Merge System into Support.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@120298 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'unittests')
-rw-r--r--unittests/ADT/StringMapTest.cpp2
-rw-r--r--unittests/CMakeLists.txt4
-rw-r--r--unittests/Makefile2
-rw-r--r--unittests/Support/EndianTest.cpp2
-rw-r--r--unittests/Support/SwapByteOrderTest.cpp2
-rw-r--r--unittests/System/Makefile2
-rw-r--r--unittests/System/Path.cpp2
-rw-r--r--unittests/System/TimeValue.cpp2
8 files changed, 8 insertions, 10 deletions
diff --git a/unittests/ADT/StringMapTest.cpp b/unittests/ADT/StringMapTest.cpp
index 413f068..ea91348 100644
--- a/unittests/ADT/StringMapTest.cpp
+++ b/unittests/ADT/StringMapTest.cpp
@@ -9,7 +9,7 @@
#include "gtest/gtest.h"
#include "llvm/ADT/StringMap.h"
-#include "llvm/System/DataTypes.h"
+#include "llvm/Support/DataTypes.h"
using namespace llvm;
namespace {
diff --git a/unittests/CMakeLists.txt b/unittests/CMakeLists.txt
index 7953fac..8551eb8 100644
--- a/unittests/CMakeLists.txt
+++ b/unittests/CMakeLists.txt
@@ -29,7 +29,6 @@ set(LLVM_LINK_COMPONENTS
BitReader
AsmParser
Core
- System
Support
)
@@ -109,7 +108,6 @@ endif()
add_llvm_unittest(VMCore ${VMCoreSources})
set(LLVM_LINK_COMPONENTS
- System
Support
Core
)
@@ -130,7 +128,7 @@ add_llvm_unittest(Support
)
set(LLVM_LINK_COMPONENTS
- System
+ Support
)
add_llvm_unittest(System
diff --git a/unittests/Makefile b/unittests/Makefile
index 71ba552..0401cd1 100644
--- a/unittests/Makefile
+++ b/unittests/Makefile
@@ -9,7 +9,7 @@
LEVEL = ..
-PARALLEL_DIRS = ADT ExecutionEngine Support System Transforms VMCore Analysis
+PARALLEL_DIRS = ADT ExecutionEngine Support Transforms VMCore Analysis
include $(LEVEL)/Makefile.common
diff --git a/unittests/Support/EndianTest.cpp b/unittests/Support/EndianTest.cpp
index d917293..6fe0247 100644
--- a/unittests/Support/EndianTest.cpp
+++ b/unittests/Support/EndianTest.cpp
@@ -9,7 +9,7 @@
#include "gtest/gtest.h"
#include "llvm/Support/Endian.h"
-#include "llvm/System/DataTypes.h"
+#include "llvm/Support/DataTypes.h"
#include <cstdlib>
#include <ctime>
using namespace llvm;
diff --git a/unittests/Support/SwapByteOrderTest.cpp b/unittests/Support/SwapByteOrderTest.cpp
index ce8704c..c2a0c27 100644
--- a/unittests/Support/SwapByteOrderTest.cpp
+++ b/unittests/Support/SwapByteOrderTest.cpp
@@ -8,7 +8,7 @@
//===----------------------------------------------------------------------===//
#include "gtest/gtest.h"
-#include "llvm/System/SwapByteOrder.h"
+#include "llvm/Support/SwapByteOrder.h"
#include <cstdlib>
#include <ctime>
using namespace llvm;
diff --git a/unittests/System/Makefile b/unittests/System/Makefile
index 368cf32..096a761 100644
--- a/unittests/System/Makefile
+++ b/unittests/System/Makefile
@@ -9,7 +9,7 @@
LEVEL = ../..
TESTNAME = System
-LINK_COMPONENTS := system support
+LINK_COMPONENTS := support
include $(LEVEL)/Makefile.config
include $(LLVM_SRC_ROOT)/unittests/Makefile.unittest
diff --git a/unittests/System/Path.cpp b/unittests/System/Path.cpp
index b8a2f63..2b0817f 100644
--- a/unittests/System/Path.cpp
+++ b/unittests/System/Path.cpp
@@ -8,7 +8,7 @@
//===----------------------------------------------------------------------===//
// For now, just test that the header file parses.
-#include "llvm/System/PathV2.h"
+#include "llvm/Support/PathV2.h"
#include "gtest/gtest.h"
diff --git a/unittests/System/TimeValue.cpp b/unittests/System/TimeValue.cpp
index d1da5c1..7fd7c9256 100644
--- a/unittests/System/TimeValue.cpp
+++ b/unittests/System/TimeValue.cpp
@@ -8,7 +8,7 @@
//===----------------------------------------------------------------------===//
#include "gtest/gtest.h"
-#include "llvm/System/TimeValue.h"
+#include "llvm/Support/TimeValue.h"
#include <time.h>
using namespace llvm;