Commit c73ee7407cb31449875c3a5d5e936cb391b8405c
2021-07-30T12:02:00
Merge pull request #5961 from libgit2/ethomson/odb_tests_priority tests: reset odb backend priority
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52
diff --git a/src/odb.c b/src/odb.c
index 35e2259..22c8c8c 100644
--- a/src/odb.c
+++ b/src/odb.c
@@ -29,8 +29,8 @@
* We work under the assumption that most objects for long-running
* operations will be packed
*/
-int git_odb__loose_priority = 1;
-int git_odb__packed_priority = 2;
+int git_odb__loose_priority = GIT_ODB_DEFAULT_LOOSE_PRIORITY;
+int git_odb__packed_priority = GIT_ODB_DEFAULT_PACKED_PRIORITY;
bool git_odb__strict_hash_verification = true;
diff --git a/src/odb.h b/src/odb.h
index 5bebb6e..4a8ebff 100644
--- a/src/odb.h
+++ b/src/odb.h
@@ -24,6 +24,9 @@
#define GIT_OBJECT_DIR_MODE 0777
#define GIT_OBJECT_FILE_MODE 0444
+#define GIT_ODB_DEFAULT_LOOSE_PRIORITY 1
+#define GIT_ODB_DEFAULT_PACKED_PRIORITY 2
+
extern bool git_odb__strict_hash_verification;
/* DO NOT EXPORT */
diff --git a/tests/odb/sorting.c b/tests/odb/sorting.c
index dc87a85..e027230 100644
--- a/tests/odb/sorting.c
+++ b/tests/odb/sorting.c
@@ -1,5 +1,6 @@
#include "clar_libgit2.h"
#include "git2/sys/odb_backend.h"
+#include "odb.h"
typedef struct {
git_odb_backend base;
@@ -43,6 +44,11 @@ void test_odb_sorting__cleanup(void)
{
git_odb_free(_odb);
_odb = NULL;
+
+ cl_git_pass(git_libgit2_opts(GIT_OPT_SET_ODB_LOOSE_PRIORITY,
+ GIT_ODB_DEFAULT_LOOSE_PRIORITY));
+ cl_git_pass(git_libgit2_opts(GIT_OPT_SET_ODB_PACKED_PRIORITY,
+ GIT_ODB_DEFAULT_PACKED_PRIORITY));
}
void test_odb_sorting__basic_backends_sorting(void)