Skip to content

Commit c8d5b43

Browse files
committed
tests: skip sha256 tests when not compiled in
Actually `cl_skip` the sha256 tests when we're not compiled for sha256, instead of passing them.
1 parent d111cc9 commit c8d5b43

File tree

2 files changed

+21
-7
lines changed

2 files changed

+21
-7
lines changed

tests/libgit2/core/oid.c

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,9 @@ void test_core_oid__streq_sha1(void)
5252

5353
void test_core_oid__streq_sha256(void)
5454
{
55-
#ifdef GIT_EXPERIMENTAL_SHA256
55+
#ifndef GIT_EXPERIMENTAL_SHA256
56+
cl_skip();
57+
#else
5658
cl_assert_equal_i(0, git_oid_streq(&id_sha256, str_oid_sha256));
5759
cl_assert_equal_i(-1, git_oid_streq(&id_sha256, "deadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeef"));
5860

@@ -90,7 +92,9 @@ void test_core_oid__strcmp_sha1(void)
9092

9193
void test_core_oid__strcmp_sha256(void)
9294
{
93-
#ifdef GIT_EXPERIMENTAL_SHA256
95+
#ifndef GIT_EXPERIMENTAL_SHA256
96+
cl_skip();
97+
#else
9498
cl_assert_equal_i(0, git_oid_strcmp(&id_sha256, str_oid_sha256));
9599
cl_assert(git_oid_strcmp(&id_sha256, "deadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeef") < 0);
96100

@@ -129,7 +133,9 @@ void test_core_oid__ncmp_sha1(void)
129133

130134
void test_core_oid__ncmp_sha256(void)
131135
{
132-
#ifdef GIT_EXPERIMENTAL_SHA256
136+
#ifndef GIT_EXPERIMENTAL_SHA256
137+
cl_skip();
138+
#else
133139
cl_assert(!git_oid_ncmp(&id_sha256, &idp_sha256, 0));
134140
cl_assert(!git_oid_ncmp(&id_sha256, &idp_sha256, 1));
135141
cl_assert(!git_oid_ncmp(&id_sha256, &idp_sha256, 2));

tests/libgit2/odb/loose.c

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,9 @@ void test_odb_loose__exists_sha1(void)
160160

161161
void test_odb_loose__exists_sha256(void)
162162
{
163-
#ifdef GIT_EXPERIMENTAL_SHA256
163+
#ifndef GIT_EXPERIMENTAL_SHA256
164+
cl_skip();
165+
#else
164166
git_oid id, id2;
165167
git_odb *odb;
166168
git_odb_options odb_opts = GIT_ODB_OPTIONS_INIT;
@@ -201,7 +203,9 @@ void test_odb_loose__simple_reads_sha1(void)
201203

202204
void test_odb_loose__simple_reads_sha256(void)
203205
{
204-
#ifdef GIT_EXPERIMENTAL_SHA256
206+
#ifndef GIT_EXPERIMENTAL_SHA256
207+
cl_skip();
208+
#else
205209
test_read_object(&commit_sha256);
206210
test_read_object(&tree_sha256);
207211
test_read_object(&tag_sha256);
@@ -230,7 +234,9 @@ void test_odb_loose__streaming_reads_sha1(void)
230234

231235
void test_odb_loose__streaming_reads_sha256(void)
232236
{
233-
#ifdef GIT_EXPERIMENTAL_SHA256
237+
#ifndef GIT_EXPERIMENTAL_SHA256
238+
cl_skip();
239+
#else
234240
size_t blocksizes[] = { 1, 2, 4, 16, 99, 1024, 123456789 };
235241
size_t i;
236242

@@ -259,7 +265,9 @@ void test_odb_loose__read_header_sha1(void)
259265

260266
void test_odb_loose__read_header_sha256(void)
261267
{
262-
#ifdef GIT_EXPERIMENTAL_SHA256
268+
#ifndef GIT_EXPERIMENTAL_SHA256
269+
cl_skip();
270+
#else
263271
test_read_header(&commit_sha256);
264272
test_read_header(&tree_sha256);
265273
test_read_header(&tag_sha256);

0 commit comments

Comments
 (0)