New upstream version 1.4.3+dfsg.1

[libgit2.git] / tests / index / nsec.c

diff --git a/tests/index/nsec.c b/tests/index/nsec.c
index 5004339f0ea89a9f31326da1ce64210856664a17..3efd855a7e6d1772fc4c615cb457742f246235f0 100644 (file)
--- a/tests/index/nsec.c
+++ b/tests/index/nsec.c
@@ -9,7 +9,7 @@ static git_index *repo_index;
 
 #define TEST_REPO_PATH "nsecs"
 
-// Fixture setup and teardown
+/* Fixture setup and teardown */
 void test_index_nsec__initialize(void)
 {
        repo = cl_git_sandbox_init("nsecs");
@@ -24,6 +24,43 @@ void test_index_nsec__cleanup(void)
        cl_git_sandbox_cleanup();
 }
 
+static bool try_create_file_with_nsec_timestamp(const char *path)
+{
+       struct stat st;
+       int try;
+
+       /* retry a few times to avoid nanos *actually* equal 0 race condition */
+       for (try = 0; try < 3; try++) {
+               cl_git_mkfile(path, "This is hopefully a file with nanoseconds!");
+
+               cl_must_pass(p_stat(path, &st));
+
+               if (st.st_ctime_nsec && st.st_mtime_nsec)
+                       return true;
+       }
+
+       return false;
+}
+
+/* try to determine if the underlying filesystem supports a resolution
+ * higher than a single second.  (i'm looking at you, hfs+)
+ */
+static bool should_expect_nsecs(void)
+{
+       git_str nsec_path = GIT_STR_INIT;
+       bool expect;
+
+       git_str_joinpath(&nsec_path, clar_sandbox_path(), "nsec_test");
+
+       expect = try_create_file_with_nsec_timestamp(nsec_path.ptr);
+
+       cl_must_pass(p_unlink(nsec_path.ptr));
+
+       git_str_dispose(&nsec_path);
+
+       return expect;
+}
+
 static bool has_nsecs(void)
 {
        const git_index_entry *entry;
@@ -50,8 +87,13 @@ void test_index_nsec__has_nanos(void)
 void test_index_nsec__staging_maintains_other_nanos(void)
 {
        const git_index_entry *entry;
+       bool expect_nsec, test_file_has_nsec;
+
+       expect_nsec = should_expect_nsecs();
+       test_file_has_nsec = try_create_file_with_nsec_timestamp("nsecs/a.txt");
+
+       cl_assert_equal_b(expect_nsec, test_file_has_nsec);
 
-       cl_git_rewritefile("nsecs/a.txt", "This is file A");
        cl_git_pass(git_index_add_bypath(repo_index, "a.txt"));
        cl_git_pass(git_index_write(repo_index));
 
@@ -61,8 +103,17 @@ void test_index_nsec__staging_maintains_other_nanos(void)
        cl_assert_equal_b(true, has_nsecs());
 
        cl_assert((entry = git_index_get_bypath(repo_index, "a.txt", 0)));
-       cl_assert_equal_i(0, entry->ctime.nanoseconds);
-       cl_assert_equal_i(0, entry->mtime.nanoseconds);
+
+       /* if we are writing nanoseconds to the index, expect them to be
+        * nonzero.
+        */
+       if (expect_nsec) {
+               cl_assert(entry->ctime.nanoseconds != 0);
+               cl_assert(entry->mtime.nanoseconds != 0);
+       } else {
+               cl_assert_equal_i(0, entry->ctime.nanoseconds);
+               cl_assert_equal_i(0, entry->mtime.nanoseconds);
+       }
 }
 
 void test_index_nsec__status_doesnt_clear_nsecs(void)