summaryrefslogtreecommitdiff
path: root/tests/test_helpers.c
diff options
context:
space:
mode:
authorVicent Marti <tanoku@gmail.com>2010-11-02 18:42:42 +0200
committerVicent Marti <tanoku@gmail.com>2010-11-02 18:42:42 +0200
commit6fd195d76c7f52baae5540e287affe2259900d36 (patch)
tree4dd644c5086dce17827f42b8c811049175da88f9 /tests/test_helpers.c
parentd80e9d55aa2d0629f7f207db42762494075d7854 (diff)
downloadlibgit2-6fd195d76c7f52baae5540e287affe2259900d36.tar.gz
Change git_repository initialization to use a path
The constructor to git_repository is now called 'git_repository_open(path)' and takes a path to a git repository instead of an existing ODB object. Unit tests have been updated accordingly and the two test repositories have been merged into one. Signed-off-by: Vicent Marti <tanoku@gmail.com>
Diffstat (limited to 'tests/test_helpers.c')
-rw-r--r--tests/test_helpers.c19
1 files changed, 12 insertions, 7 deletions
diff --git a/tests/test_helpers.c b/tests/test_helpers.c
index 08434b8e1..86192233a 100644
--- a/tests/test_helpers.c
+++ b/tests/test_helpers.c
@@ -84,18 +84,23 @@ int remove_object_files(const char *odb_dir, object_data *d)
return 0;
}
-int remove_loose_object(const char *odb_dir, git_object *object)
+int remove_loose_object(const char *repository_folder, git_object *object)
{
+ static const char *objects_folder = "objects/";
+
char *ptr, *full_path, *top_folder;
- int path_length;
+ int path_length, objects_length;
+
+ assert(repository_folder && object);
- assert(odb_dir && object);
+ objects_length = strlen(objects_folder);
+ path_length = strlen(repository_folder);
+ ptr = full_path = git__malloc(path_length + objects_length + GIT_OID_HEXSZ + 3);
- path_length = strlen(odb_dir);
- ptr = full_path = git__malloc(path_length + GIT_OID_HEXSZ + 3);
+ strcpy(ptr, repository_folder);
+ strcpy(ptr + path_length, objects_folder);
- strcpy(ptr, odb_dir);
- ptr = top_folder = ptr + path_length;
+ ptr = top_folder = ptr + path_length + objects_length;
*ptr++ = '/';
git_oid_pathfmt(ptr, git_object_id(object));
ptr += GIT_OID_HEXSZ + 1;