Author: hans
Date: Fri Aug 12 12:59:24 2016
New Revision: 278538
URL: http://llvm.org/viewvc/llvm-project?rev=278538&view=rev
Log:
Merging r278357:
------------------------------------------------------------------------
r278357 | compnerd | 2016-08-11 09:58:12 -0700 (Thu, 11 Aug 2016) | 6 lines
test: relax the FS test a slight bit to be more reliable
Some filesystems track atime always. This relaxes the test to accept either a
filesystem which does not accurately track atime or does track the atime
accurately. This allows the test to pass on filesystems mounted with
`strictatime` on Linux or on macOS.
------------------------------------------------------------------------
Modified:
libcxx/branches/release_39/ (props changed)
libcxx/branches/release_39/test/std/experimental/filesystem/fs.op.funcs/fs.op.last_write_time/last_write_time.pass.cpp
Propchange: libcxx/branches/release_39/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 12 12:59:24 2016
@@ -1,2 +1,2 @@
/libcxx/branches/apple:136569-137939
-/libcxx/trunk:278282,278387
+/libcxx/trunk:278282,278357,278387
Modified:
libcxx/branches/release_39/test/std/experimental/filesystem/fs.op.funcs/fs.op.last_write_time/last_write_time.pass.cpp
URL:
http://llvm.org/viewvc/llvm-project/libcxx/branches/release_39/test/std/experimental/filesystem/fs.op.funcs/fs.op.last_write_time/last_write_time.pass.cpp?rev=278538&r1=278537&r2=278538&view=diff
==============================================================================
---
libcxx/branches/release_39/test/std/experimental/filesystem/fs.op.funcs/fs.op.last_write_time/last_write_time.pass.cpp
(original)
+++
libcxx/branches/release_39/test/std/experimental/filesystem/fs.op.funcs/fs.op.last_write_time/last_write_time.pass.cpp
Fri Aug 12 12:59:24 2016
@@ -158,7 +158,8 @@ TEST_CASE(get_last_write_time_dynamic_en
TEST_CHECK(ftime2 > ftime);
TEST_CHECK(dtime2 > dtime);
- TEST_CHECK(LastAccessTime(file) == file_access_time);
+ TEST_CHECK(LastAccessTime(file) == file_access_time ||
+ LastAccessTime(file) == Clock::to_time_t(ftime2));
TEST_CHECK(LastAccessTime(dir) == dir_access_time);
}
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
