Revert "threads: Fix TLS declarations"

This commit uploaded an old broken test. Oops!
This commit is contained in:
Vicent Marti 2011-06-07 03:38:09 +02:00
parent 1097dacd7d
commit 9d77d83a81
3 changed files with 32 additions and 55 deletions

View File

@ -31,48 +31,41 @@
* http://predef.sourceforge.net/precomp.html * http://predef.sourceforge.net/precomp.html
*/ */
#ifdef GIT_THREADS #define GIT_HAS_TLS 1
# define GIT_HAS_TLS 1
/* No TLS in Cygwin */ #if defined(__APPLE__) && defined(__MACH__)
# if defined(__CHECKER__) || defined(__CYGWIN__) # undef GIT_TLS
# undef GIT_HAS_TLS # define GIT_TLS
# define GIT_TLS
/* No TLS in Mach binaries for Mac OS X */ #elif defined(__GNUC__) || \
# elif defined(__APPLE__) && defined(__MACH__) defined(__SUNPRO_C) || \
# undef GIT_TLS defined(__SUNPRO_CC) || \
# define GIT_TLS defined(__xlc__) || \
defined(__xlC__)
# define GIT_TLS __thread
/* Normal TLS for GCC */ #elif defined(__INTEL_COMPILER)
# elif defined(__GNUC__) || \ # if defined(_WIN32) || defined(_WIN32_CE)
defined(__SUNPRO_C) || \ # define GIT_TLS __declspec(thread)
defined(__SUNPRO_CC) || \ # else
defined(__xlc__) || \ # define GIT_TLS __thread
defined(__xlC__) # endif
# define GIT_TLS __thread
/* ICC may run on Windows or Linux */ #elif defined(_WIN32) || \
# elif defined(__INTEL_COMPILER) defined(_WIN32_CE) || \
# if defined(_WIN32) || defined(_WIN32_CE) defined(__BORLANDC__)
# define GIT_TLS __declspec(thread) # define GIT_TLS __declspec(thread)
# else
# define GIT_TLS __thread
# endif
/* Declspec for MSVC in Win32 */ #else
# elif defined(_WIN32) || \ # undef GIT_HAS_TLS
defined(_WIN32_CE) || \ # define GIT_TLS /* nothing: tls vars are thread-global */
defined(__BORLANDC__) #endif
# define GIT_TLS __declspec(thread)
/* Other platform; no TLS */ /* sparse and cygwin don't grok thread-local variables */
# else #if defined(__CHECKER__) || defined(__CYGWIN__)
# undef GIT_HAS_TLS # undef GIT_HAS_TLS
# define GIT_TLS /* nothing: tls vars are thread-global */ # undef GIT_TLS
# endif # define GIT_TLS
#else /* Disable TLS if libgit2 is not threadsafe */ #endif
# define GIT_TLS
#endif /* GIT_THREADS */
#endif /* INCLUDE_git_thread_utils_h__ */ #endif /* INCLUDE_git_thread_utils_h__ */

View File

@ -931,24 +931,9 @@ BEGIN_TEST(list1, "try to list only the symbolic references")
git_repository_free(repo); git_repository_free(repo);
END_TEST END_TEST
BEGIN_TEST(corruption0, "Check a the packed-refs file is not corrupted")
git_reference *ref;
git_repository *repo;
must_pass(git_repository_open(&repo, "/Users/vicent/src/github/.git"));
/* Lookup the reference */
must_pass(git_reference_lookup(&ref, repo, "refs/heads/redcarpet-deploy"));
/* Now that the reference is deleted... */
must_pass(git_reference_delete(ref));
git_repository_free(repo);
END_TEST
BEGIN_SUITE(refs) BEGIN_SUITE(refs)
/* ADD_TEST(readtag0); ADD_TEST(readtag0);
ADD_TEST(readtag1); ADD_TEST(readtag1);
ADD_TEST(readsym0); ADD_TEST(readsym0);
@ -986,6 +971,5 @@ BEGIN_SUITE(refs)
ADD_TEST(delete0); ADD_TEST(delete0);
ADD_TEST(list0); ADD_TEST(list0);
ADD_TEST(list1); */ ADD_TEST(list1);
ADD_TEST(corruption0);
END_SUITE END_SUITE