diff options
| author | Michael J. Spencer <bigcheesegs@gmail.com> | 2010-11-29 22:29:04 +0000 |
|---|---|---|
| committer | Michael J. Spencer <bigcheesegs@gmail.com> | 2010-11-29 22:29:04 +0000 |
| commit | 013d15a677f70aa9c91fa09707e5d4248146b99d (patch) | |
| tree | 5bce3eaa77f5e3f8f482b57b2425cf8b5c5ab5df | |
| parent | dffde9964480f946d4308ce936b667b6c37b1059 (diff) | |
| download | llvm-013d15a677f70aa9c91fa09707e5d4248146b99d.tar.gz llvm-013d15a677f70aa9c91fa09707e5d4248146b99d.tar.bz2 llvm-013d15a677f70aa9c91fa09707e5d4248146b99d.tar.xz | |
unittests: Merge SystemTests back into SupportTests.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@120330 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | unittests/CMakeLists.txt | 11 | ||||
| -rw-r--r-- | unittests/Support/Path.cpp (renamed from unittests/System/Path.cpp) | 4 | ||||
| -rw-r--r-- | unittests/Support/TimeValue.cpp (renamed from unittests/System/TimeValue.cpp) | 4 | ||||
| -rw-r--r-- | unittests/System/Makefile | 15 |
4 files changed, 6 insertions, 28 deletions
diff --git a/unittests/CMakeLists.txt b/unittests/CMakeLists.txt index 8551eb81bc..c64ab3ce08 100644 --- a/unittests/CMakeLists.txt +++ b/unittests/CMakeLists.txt @@ -120,18 +120,11 @@ add_llvm_unittest(Support Support/EndianTest.cpp Support/LeakDetectorTest.cpp Support/MathExtrasTest.cpp + Support/Path.cpp Support/raw_ostream_test.cpp Support/RegexTest.cpp Support/SwapByteOrderTest.cpp + Support/TimeValue.cpp Support/TypeBuilderTest.cpp Support/ValueHandleTest.cpp ) - -set(LLVM_LINK_COMPONENTS - Support - ) - -add_llvm_unittest(System - System/Path.cpp - System/TimeValue.cpp - ) diff --git a/unittests/System/Path.cpp b/unittests/Support/Path.cpp index daeb0175d2..8be45de76b 100644 --- a/unittests/System/Path.cpp +++ b/unittests/Support/Path.cpp @@ -1,4 +1,4 @@ -//===- llvm/unittest/System/Path.cpp - Path tests -------------------------===// +//===- llvm/unittest/Support/Path.cpp - Path tests ------------------------===// // // The LLVM Compiler Infrastructure // @@ -15,7 +15,7 @@ using namespace llvm; namespace { -TEST(System, Path) { +TEST(Support, Path) { SmallVector<StringRef, 40> paths; paths.push_back(""); paths.push_back("."); diff --git a/unittests/System/TimeValue.cpp b/unittests/Support/TimeValue.cpp index 7fd7c9256f..27883ae335 100644 --- a/unittests/System/TimeValue.cpp +++ b/unittests/Support/TimeValue.cpp @@ -1,4 +1,4 @@ -//===- llvm/unittest/System/TimeValue.cpp - Time Vlaue tests --------------===// +//===- llvm/unittest/Support/TimeValue.cpp - Time Value tests -------------===// // // The LLVM Compiler Infrastructure // @@ -14,7 +14,7 @@ using namespace llvm; namespace { -TEST(System, TimeValue) { +TEST(Support, TimeValue) { sys::TimeValue now = sys::TimeValue::now(); time_t now_t = time(NULL); EXPECT_TRUE(abs(static_cast<long>(now_t - now.toEpochTime())) < 2); diff --git a/unittests/System/Makefile b/unittests/System/Makefile deleted file mode 100644 index 096a761894..0000000000 --- a/unittests/System/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -##===- unittests/System/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 = System -LINK_COMPONENTS := support - -include $(LEVEL)/Makefile.config -include $(LLVM_SRC_ROOT)/unittests/Makefile.unittest |