proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-21 14:39:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

tests: handle life without threads

Browse Source
This commit is contained in:
Edward Thomson 2016-11-18 18:30:20 +00:00
parent 6a05c7a0ef
commit 6367c58cd4
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/clar_libgit2.h
View File

@ -59,7 +59,11 @@ typedef struct {
char error_msg[4096]; char error_msg[4096];
} cl_git_thread_err; } cl_git_thread_err;
#define cl_git_thread_pass(threaderr, expr) cl_git_thread_pass_(threaderr, (expr), __FILE__, __LINE__) #ifdef GIT_THREADS
# define cl_git_thread_pass(threaderr, expr) cl_git_thread_pass_(threaderr, (expr), __FILE__, __LINE__)
#else
# define cl_git_thread_pass(threaderr, expr) cl_git_pass(expr)
#endif
#define cl_git_thread_pass_(__threaderr, __expr, __file, __line) do { \ #define cl_git_thread_pass_(__threaderr, __expr, __file, __line) do { \
giterr_clear(); \ giterr_clear(); \

8
tests/threads/basic.c
View File

@ -49,6 +49,7 @@ void test_threads_basic__set_error(void)
run_in_parallel(1, 4, set_error, NULL, NULL); run_in_parallel(1, 4, set_error, NULL, NULL);
} }
#ifdef GIT_THREADS
static void *return_normally(void *param) static void *return_normally(void *param)
{ {
return param; return param;
@ -59,9 +60,13 @@ static void *exit_abruptly(void *param)
git_thread_exit(param); git_thread_exit(param);
return NULL; return NULL;
} }
#endif
void test_threads_basic__exit(void) void test_threads_basic__exit(void)
{ {
#ifndef GIT_THREADS
clar__skip();
#else
git_thread thread; git_thread thread;
void *result; void *result;
@ -74,4 +79,5 @@ void test_threads_basic__exit(void)
cl_git_pass(git_thread_create(&thread, return_normally, (void *)232323)); cl_git_pass(git_thread_create(&thread, return_normally, (void *)232323));
cl_git_pass(git_thread_join(&thread, &result)); cl_git_pass(git_thread_join(&thread, &result));
cl_assert_equal_sz(232323, (size_t)result); cl_assert_equal_sz(232323, (size_t)result);
} #endif
}