unittests: Merge SystemTests back into SupportTests.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@120330 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/unittests/CMakeLists.txt b/unittests/CMakeLists.txt
index 8551eb81bc7f11f35bc78f5761c56c6e25810e4e..c64ab3ce08277e990ac18fd9e8488f770aadc6db 100644 (file)
--- 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/Support/Path.cpp b/unittests/Support/Path.cpp
new file mode 100644 (file)
index 0000000..8be45de
--- /dev/null
+++ b/unittests/Support/Path.cpp
@@ -0,0 +1,91 @@
+//===- llvm/unittest/Support/Path.cpp - Path tests ------------------------===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#include "llvm/Support/PathV2.h"
+
+#include "gtest/gtest.h"
+
+using namespace llvm;
+
+namespace {
+
+TEST(Support, Path) {
+  SmallVector<StringRef, 40> paths;
+  paths.push_back("");
+  paths.push_back(".");
+  paths.push_back("..");
+  paths.push_back("foo");
+  paths.push_back("/");
+  paths.push_back("/foo");
+  paths.push_back("foo/");
+  paths.push_back("/foo/");
+  paths.push_back("foo/bar");
+  paths.push_back("/foo/bar");
+  paths.push_back("//net");
+  paths.push_back("//net/foo");
+  paths.push_back("///foo///");
+  paths.push_back("///foo///bar");
+  paths.push_back("/.");
+  paths.push_back("./");
+  paths.push_back("/..");
+  paths.push_back("../");
+  paths.push_back("foo/.");
+  paths.push_back("foo/..");
+  paths.push_back("foo/./");
+  paths.push_back("foo/./bar");
+  paths.push_back("foo/..");
+  paths.push_back("foo/../");
+  paths.push_back("foo/../bar");
+  paths.push_back("c:");
+  paths.push_back("c:/");
+  paths.push_back("c:foo");
+  paths.push_back("c:/foo");
+  paths.push_back("c:foo/");
+  paths.push_back("c:/foo/");
+  paths.push_back("c:/foo/bar");
+  paths.push_back("prn:");
+  paths.push_back("c:\\");
+  paths.push_back("c:foo");
+  paths.push_back("c:\\foo");
+  paths.push_back("c:foo\\");
+  paths.push_back("c:\\foo\\");
+  paths.push_back("c:\\foo/");
+  paths.push_back("c:/foo\\bar");
+
+  for (SmallVector<StringRef, 40>::const_iterator i = paths.begin(),
+                                                  e = paths.end();
+                                                  i != e;
+                                                  ++i) {
+    outs() << *i << " =>\n    Iteration: [";
+    for (sys::path::const_iterator ci = sys::path::begin(*i),
+                                   ce = sys::path::end(*i);
+                                   ci != ce;
+                                   ++ci) {
+      outs() << *ci << ',';
+    }
+    outs() << "]\n";
+
+    StringRef res;
+    SmallString<16> temp_store;
+    if (error_code ec = sys::path::root_path(*i, res)) ASSERT_FALSE(ec.message().c_str());
+    outs() << "    root_path: " << res << '\n';
+    if (error_code ec = sys::path::root_name(*i, res)) ASSERT_FALSE(ec.message().c_str());
+    outs() << "    root_name: " << res << '\n';
+    if (error_code ec = sys::path::root_directory(*i, res)) ASSERT_FALSE(ec.message().c_str());
+    outs() << "    root_directory: " << res << '\n';
+
+    temp_store = *i;
+    if (error_code ec = sys::path::make_absolute(temp_store)) ASSERT_FALSE(ec.message().c_str());
+    outs() << "    make_absolute: " << temp_store << '\n';
+
+    outs().flush();
+  }
+}
+
+} // anonymous namespace

diff --git a/unittests/Support/TimeValue.cpp b/unittests/Support/TimeValue.cpp
new file mode 100644 (file)
index 0000000..27883ae
--- /dev/null
+++ b/unittests/Support/TimeValue.cpp
@@ -0,0 +1,23 @@
+//===- llvm/unittest/Support/TimeValue.cpp - Time Value tests -------------===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#include "gtest/gtest.h"
+#include "llvm/Support/TimeValue.h"
+#include <time.h>
+
+using namespace llvm;
+namespace {
+
+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 (file)
index 096a761..0000000
--- 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

diff --git a/unittests/System/Path.cpp b/unittests/System/Path.cpp
deleted file mode 100644 (file)
index daeb017..0000000
--- a/unittests/System/Path.cpp
+++ /dev/null
@@ -1,91 +0,0 @@
-//===- llvm/unittest/System/Path.cpp - Path tests -------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Support/PathV2.h"
-
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-namespace {
-
-TEST(System, Path) {
-  SmallVector<StringRef, 40> paths;
-  paths.push_back("");
-  paths.push_back(".");
-  paths.push_back("..");
-  paths.push_back("foo");
-  paths.push_back("/");
-  paths.push_back("/foo");
-  paths.push_back("foo/");
-  paths.push_back("/foo/");
-  paths.push_back("foo/bar");
-  paths.push_back("/foo/bar");
-  paths.push_back("//net");
-  paths.push_back("//net/foo");
-  paths.push_back("///foo///");
-  paths.push_back("///foo///bar");
-  paths.push_back("/.");
-  paths.push_back("./");
-  paths.push_back("/..");
-  paths.push_back("../");
-  paths.push_back("foo/.");
-  paths.push_back("foo/..");
-  paths.push_back("foo/./");
-  paths.push_back("foo/./bar");
-  paths.push_back("foo/..");
-  paths.push_back("foo/../");
-  paths.push_back("foo/../bar");
-  paths.push_back("c:");
-  paths.push_back("c:/");
-  paths.push_back("c:foo");
-  paths.push_back("c:/foo");
-  paths.push_back("c:foo/");
-  paths.push_back("c:/foo/");
-  paths.push_back("c:/foo/bar");
-  paths.push_back("prn:");
-  paths.push_back("c:\\");
-  paths.push_back("c:foo");
-  paths.push_back("c:\\foo");
-  paths.push_back("c:foo\\");
-  paths.push_back("c:\\foo\\");
-  paths.push_back("c:\\foo/");
-  paths.push_back("c:/foo\\bar");
-
-  for (SmallVector<StringRef, 40>::const_iterator i = paths.begin(),
-                                                  e = paths.end();
-                                                  i != e;
-                                                  ++i) {
-    outs() << *i << " =>\n    Iteration: [";
-    for (sys::path::const_iterator ci = sys::path::begin(*i),
-                                   ce = sys::path::end(*i);
-                                   ci != ce;
-                                   ++ci) {
-      outs() << *ci << ',';
-    }
-    outs() << "]\n";
-
-    StringRef res;
-    SmallString<16> temp_store;
-    if (error_code ec = sys::path::root_path(*i, res)) ASSERT_FALSE(ec.message().c_str());
-    outs() << "    root_path: " << res << '\n';
-    if (error_code ec = sys::path::root_name(*i, res)) ASSERT_FALSE(ec.message().c_str());
-    outs() << "    root_name: " << res << '\n';
-    if (error_code ec = sys::path::root_directory(*i, res)) ASSERT_FALSE(ec.message().c_str());
-    outs() << "    root_directory: " << res << '\n';
-
-    temp_store = *i;
-    if (error_code ec = sys::path::make_absolute(temp_store)) ASSERT_FALSE(ec.message().c_str());
-    outs() << "    make_absolute: " << temp_store << '\n';
-
-    outs().flush();
-  }
-}
-
-} // anonymous namespace

diff --git a/unittests/System/TimeValue.cpp b/unittests/System/TimeValue.cpp
deleted file mode 100644 (file)
index 7fd7c92..0000000
--- a/unittests/System/TimeValue.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-//===- llvm/unittest/System/TimeValue.cpp - Time Vlaue tests --------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#include "gtest/gtest.h"
-#include "llvm/Support/TimeValue.h"
-#include <time.h>
-
-using namespace llvm;
-namespace {
-
-TEST(System, TimeValue) {
-  sys::TimeValue now = sys::TimeValue::now();
-  time_t now_t = time(NULL);
-  EXPECT_TRUE(abs(static_cast<long>(now_t - now.toEpochTime())) < 2);
-}
-
-}