diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2022-09-21 15:19:30 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-21 15:19:30 +0100 |
| commit | 9286e5991ecea7fcdad2f6e68181e30d240ebd98 (patch) | |
| tree | 6dfbcb0fae67726d7dee97bec04f40b6902f6588 /tests | |
| parent | d78fad1519fa8ea85d6a461ac4a394c834da2624 (diff) | |
| parent | c11724686c145e8074d46b2289e2a857613ea4a2 (diff) | |
| download | libgit2-9286e5991ecea7fcdad2f6e68181e30d240ebd98.tar.gz | |
Merge pull request #6405 from libgit2/ethomson/experimental
Support non-cmake builds with an in-tree `experimental.h`
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/libgit2/core/oid.c | 12 | ||||
| -rw-r--r-- | tests/libgit2/odb/loose.c | 16 |
2 files changed, 21 insertions, 7 deletions
diff --git a/tests/libgit2/core/oid.c b/tests/libgit2/core/oid.c index 9fe4413b7..90fb37514 100644 --- a/tests/libgit2/core/oid.c +++ b/tests/libgit2/core/oid.c @@ -52,7 +52,9 @@ void test_core_oid__streq_sha1(void) void test_core_oid__streq_sha256(void) { -#ifdef GIT_EXPERIMENTAL_SHA256 +#ifndef GIT_EXPERIMENTAL_SHA256 + cl_skip(); +#else cl_assert_equal_i(0, git_oid_streq(&id_sha256, str_oid_sha256)); cl_assert_equal_i(-1, git_oid_streq(&id_sha256, "deadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeef")); @@ -90,7 +92,9 @@ void test_core_oid__strcmp_sha1(void) void test_core_oid__strcmp_sha256(void) { -#ifdef GIT_EXPERIMENTAL_SHA256 +#ifndef GIT_EXPERIMENTAL_SHA256 + cl_skip(); +#else cl_assert_equal_i(0, git_oid_strcmp(&id_sha256, str_oid_sha256)); cl_assert(git_oid_strcmp(&id_sha256, "deadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeef") < 0); @@ -129,7 +133,9 @@ void test_core_oid__ncmp_sha1(void) void test_core_oid__ncmp_sha256(void) { -#ifdef GIT_EXPERIMENTAL_SHA256 +#ifndef GIT_EXPERIMENTAL_SHA256 + cl_skip(); +#else cl_assert(!git_oid_ncmp(&id_sha256, &idp_sha256, 0)); cl_assert(!git_oid_ncmp(&id_sha256, &idp_sha256, 1)); cl_assert(!git_oid_ncmp(&id_sha256, &idp_sha256, 2)); diff --git a/tests/libgit2/odb/loose.c b/tests/libgit2/odb/loose.c index e79525478..0409dfb28 100644 --- a/tests/libgit2/odb/loose.c +++ b/tests/libgit2/odb/loose.c @@ -160,7 +160,9 @@ void test_odb_loose__exists_sha1(void) void test_odb_loose__exists_sha256(void) { -#ifdef GIT_EXPERIMENTAL_SHA256 +#ifndef GIT_EXPERIMENTAL_SHA256 + cl_skip(); +#else git_oid id, id2; git_odb *odb; git_odb_options odb_opts = GIT_ODB_OPTIONS_INIT; @@ -201,7 +203,9 @@ void test_odb_loose__simple_reads_sha1(void) void test_odb_loose__simple_reads_sha256(void) { -#ifdef GIT_EXPERIMENTAL_SHA256 +#ifndef GIT_EXPERIMENTAL_SHA256 + cl_skip(); +#else test_read_object(&commit_sha256); test_read_object(&tree_sha256); test_read_object(&tag_sha256); @@ -230,7 +234,9 @@ void test_odb_loose__streaming_reads_sha1(void) void test_odb_loose__streaming_reads_sha256(void) { -#ifdef GIT_EXPERIMENTAL_SHA256 +#ifndef GIT_EXPERIMENTAL_SHA256 + cl_skip(); +#else size_t blocksizes[] = { 1, 2, 4, 16, 99, 1024, 123456789 }; size_t i; @@ -259,7 +265,9 @@ void test_odb_loose__read_header_sha1(void) void test_odb_loose__read_header_sha256(void) { -#ifdef GIT_EXPERIMENTAL_SHA256 +#ifndef GIT_EXPERIMENTAL_SHA256 + cl_skip(); +#else test_read_header(&commit_sha256); test_read_header(&tree_sha256); test_read_header(&tag_sha256); |