diff options
| author | Vicent Marti <vicent@github.com> | 2014-06-08 16:44:14 +0200 |
|---|---|---|
| committer | Vicent Marti <vicent@github.com> | 2014-06-08 16:44:14 +0200 |
| commit | 9560203d36647e6d3c0e089939ffe285cf21bf32 (patch) | |
| tree | 84b41c3100b3ce52fbfee514891927a16f8594bb /tests | |
| parent | df192198d3ac2a2bd3d7960477e48602f648ec08 (diff) | |
| parent | 1b4e29b7f68ce80bb01fd878f6ddc6cf20819581 (diff) | |
| download | libgit2-9560203d36647e6d3c0e089939ffe285cf21bf32.tar.gz | |
Merge pull request #2409 from phkelley/win32_thread_fixes
Win32: Fix object::cache::threadmania test on x64
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/object/cache.c | 4 | ||||
| -rw-r--r-- | tests/threads/refdb.c | 4 | ||||
| -rw-r--r-- | tests/threads/thread_helpers.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/tests/object/cache.c b/tests/object/cache.c index b927b2514..bdf12da7a 100644 --- a/tests/object/cache.c +++ b/tests/object/cache.c @@ -229,7 +229,7 @@ void test_object_cache__threadmania(void) #ifdef GIT_THREADS for (th = 0; th < THREADCOUNT; ++th) { - cl_git_pass(git_thread_join(t[th], &data)); + cl_git_pass(git_thread_join(&t[th], &data)); cl_assert_equal_i(th, ((int *)data)[0]); git__free(data); } @@ -276,7 +276,7 @@ void test_object_cache__fast_thread_rush(void) #ifdef GIT_THREADS for (th = 0; th < THREADCOUNT*2; ++th) { void *rval; - cl_git_pass(git_thread_join(t[th], &rval)); + cl_git_pass(git_thread_join(&t[th], &rval)); cl_assert_equal_i(th, *((int *)rval)); } #endif diff --git a/tests/threads/refdb.c b/tests/threads/refdb.c index c1cd29677..94a21f259 100644 --- a/tests/threads/refdb.c +++ b/tests/threads/refdb.c @@ -84,7 +84,7 @@ void test_threads_refdb__iterator(void) #ifdef GIT_THREADS for (t = 0; t < THREADS; ++t) { - cl_git_pass(git_thread_join(th[t], NULL)); + cl_git_pass(git_thread_join(&th[t], NULL)); } #endif @@ -215,7 +215,7 @@ void test_threads_refdb__edit_while_iterate(void) } for (t = 0; t < THREADS; ++t) { - cl_git_pass(git_thread_join(th[t], NULL)); + cl_git_pass(git_thread_join(&th[t], NULL)); } #endif } diff --git a/tests/threads/thread_helpers.c b/tests/threads/thread_helpers.c index 25370dddb..760a7bd33 100644 --- a/tests/threads/thread_helpers.c +++ b/tests/threads/thread_helpers.c @@ -32,7 +32,7 @@ void run_in_parallel( #ifdef GIT_THREADS for (t = 0; t < threads; ++t) - cl_git_pass(git_thread_join(th[t], NULL)); + cl_git_pass(git_thread_join(&th[t], NULL)); memset(th, 0, threads * sizeof(git_thread)); #endif |