Merge commit '10251753b6897adcd22cc981c0cc42f348c109de' into merge-20130807

Conflicts:
	lib/Archive/ArchiveReader.cpp
	lib/Support/Unix/PathV2.inc

Change-Id: I29d8c1e321a4a380b6013f00bac6a8e4b593cc4e

1 files changed, 39 insertions, 0 deletions

diff --git a/unittests/Support/TimeValueTest.cpp b/unittests/Support/TimeValueTest.cpp
new file mode 100644
index 0000000..fb2abe3
--- /dev/null
+++ b/unittests/Support/TimeValueTest.cpp
@@ -0,0 +1,39 @@
+//===- llvm/unittest/Support/TimeValueTest.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(TimeValue, time_t) {
+  sys::TimeValue now = sys::TimeValue::now();
+  time_t now_t = time(NULL);
+  EXPECT_TRUE(abs(static_cast<long>(now_t - now.toEpochTime())) < 2);
+}
+
+TEST(TimeValue, Win32FILETIME) {
+  uint64_t epoch_as_filetime = 0x19DB1DED53E8000ULL;
+  uint32_t ns = 765432100;
+  sys::TimeValue epoch;
+
+  // FILETIME has 100ns of intervals.
+  uint64_t ft1970 = epoch_as_filetime + ns / 100;
+  epoch.fromWin32Time(ft1970);
+
+  // The "seconds" part in Posix time may be expected as zero.
+  EXPECT_EQ(ns / 100, epoch.toPosixTime());
+
+  // Confirm it reversible.
+  EXPECT_EQ(ft1970, epoch.toWin32Time());
+}
+
+}