summaryrefslogtreecommitdiff
path: root/tests/libgit2
diff options
context:
space:
mode:
authorEdward Thomson <ethomson@github.com>2022-04-06 10:22:29 -0400
committerEdward Thomson <ethomson@github.com>2022-04-06 15:15:26 -0400
commite7fce1b5e5a2854a3464df9626f0383b08c70ca0 (patch)
tree15a317df4ed46030a869791ef795910010fd2963 /tests/libgit2
parent4e85b4fccc75696f2ecdd5b07429b574fc6e4650 (diff)
downloadlibgit2-e7fce1b5e5a2854a3464df9626f0383b08c70ca0.tar.gz
tests: support flaky stat
The 32-bit ARM QEMU builds are flaky when running `lstat`. Disable those testing `lstat`'s `st_size` temporarily.
Diffstat (limited to 'tests/libgit2')
-rw-r--r--tests/libgit2/diff/workdir.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/tests/libgit2/diff/workdir.c b/tests/libgit2/diff/workdir.c
index a3e92908c..20e000906 100644
--- a/tests/libgit2/diff/workdir.c
+++ b/tests/libgit2/diff/workdir.c
@@ -1238,6 +1238,7 @@ void test_diff_workdir__can_diff_empty_file(void)
git_tree *tree;
git_diff_options opts = GIT_DIFF_OPTIONS_INIT;
git_patch *patch;
+ struct stat st = {0};
g_repo = cl_git_sandbox_init("attr_index");
@@ -1252,13 +1253,10 @@ void test_diff_workdir__can_diff_empty_file(void)
/* empty contents of file */
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_assert(st.st_size == 0);
- }
-#endif
+ cl_git_pass(git_fs_path_lstat("attr_index/README.txt", &st));
+
+ if (!cl_is_env_set("GITTEST_FLAKY_STAT"))
+ cl_assert_equal_sz(0, st.st_size);
cl_git_pass(git_diff_tree_to_workdir(&diff, g_repo, tree, &opts));
cl_assert_equal_i(3, (int)git_diff_num_deltas(diff));