Unverified Commit 4e85b4fc by Edward Thomson Committed by GitHub

Merge pull request #6259 from libgit2/ethomson/diff_arm32

diff: don't stat empty file on arm32 (flaky test)
parents cd8fde82 42093d6a
...@@ -1237,7 +1237,6 @@ void test_diff_workdir__can_diff_empty_file(void) ...@@ -1237,7 +1237,6 @@ void test_diff_workdir__can_diff_empty_file(void)
git_diff *diff; git_diff *diff;
git_tree *tree; git_tree *tree;
git_diff_options opts = GIT_DIFF_OPTIONS_INIT; git_diff_options opts = GIT_DIFF_OPTIONS_INIT;
struct stat st;
git_patch *patch; git_patch *patch;
g_repo = cl_git_sandbox_init("attr_index"); g_repo = cl_git_sandbox_init("attr_index");
...@@ -1251,10 +1250,15 @@ void test_diff_workdir__can_diff_empty_file(void) ...@@ -1251,10 +1250,15 @@ void test_diff_workdir__can_diff_empty_file(void)
git_diff_free(diff); git_diff_free(diff);
/* empty contents of file */ /* empty contents of file */
cl_git_rewritefile("attr_index/README.txt", ""); cl_git_rewritefile("attr_index/README.txt", "");
#if !defined(__arm__) || !defined(GIT_ARCH_32)
{
struct stat st;
cl_git_pass(git_fs_path_lstat("attr_index/README.txt", &st)); cl_git_pass(git_fs_path_lstat("attr_index/README.txt", &st));
cl_assert_equal_i(0, (int)st.st_size); cl_assert(st.st_size == 0);
}
#endif
cl_git_pass(git_diff_tree_to_workdir(&diff, g_repo, tree, &opts)); cl_git_pass(git_diff_tree_to_workdir(&diff, g_repo, tree, &opts));
cl_assert_equal_i(3, (int)git_diff_num_deltas(diff)); cl_assert_equal_i(3, (int)git_diff_num_deltas(diff));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment