mirror of
https://git.proxmox.com/git/libgit2
synced 2026-02-01 19:03:40 +00:00
Merge pull request #1197 from nulltoken/travis/run-online-tests
travis: Include the online suite when running against Travis
This commit is contained in:
commit
74f880a639
@ -33,7 +33,7 @@ script:
|
||||
|
||||
# Run Tests
|
||||
after_script:
|
||||
- if [ -f ./libgit2_clar ]; then valgrind --leak-check=full --show-reachable=yes --suppressions=../libgit2_clar.supp ./libgit2_clar -iall; else echo "Skipping valgrind"; fi
|
||||
- if [ -f ./libgit2_clar ]; then valgrind --leak-check=full --show-reachable=yes --suppressions=../libgit2_clar.supp ./libgit2_clar -ionline; else echo "Skipping valgrind"; fi
|
||||
|
||||
# Only watch the development branch
|
||||
branches:
|
||||
|
||||
@ -268,7 +268,7 @@ IF (BUILD_CLAR)
|
||||
ENDIF ()
|
||||
|
||||
ENABLE_TESTING()
|
||||
ADD_TEST(libgit2_clar libgit2_clar)
|
||||
ADD_TEST(libgit2_clar libgit2_clar -ionline)
|
||||
ENDIF ()
|
||||
|
||||
IF (TAGS)
|
||||
|
||||
@ -333,6 +333,7 @@ static int setup_remotes_and_fetch(
|
||||
}
|
||||
git_remote_disconnect(origin);
|
||||
}
|
||||
git_remote_free(origin);
|
||||
}
|
||||
|
||||
return retcode;
|
||||
|
||||
@ -107,8 +107,7 @@ int git_reset(
|
||||
if (reset_type > GIT_RESET_SOFT) {
|
||||
/* reset index to the target content */
|
||||
|
||||
if ((error = git_repository_index(&index, repo)) < 0 ||
|
||||
(error = git_index_read_tree(index, tree)) < 0 ||
|
||||
if ((error = git_index_read_tree(index, tree)) < 0 ||
|
||||
(error = git_index_write(index)) < 0)
|
||||
goto cleanup;
|
||||
|
||||
|
||||
@ -67,6 +67,9 @@ void test_checkout_tree__can_checkout_and_remove_directory(void)
|
||||
cl_assert_equal_i(true, git_path_isfile("./testrepo/ab/de/2.txt"));
|
||||
cl_assert_equal_i(true, git_path_isfile("./testrepo/ab/de/fgh/1.txt"));
|
||||
|
||||
git_object_free(g_object);
|
||||
g_object = NULL;
|
||||
|
||||
/* Checkout brach "master" and update HEAD, so that HEAD matches the
|
||||
* current working tree
|
||||
*/
|
||||
@ -136,6 +139,9 @@ void test_checkout_tree__doesnt_write_unrequested_files_to_worktree(void)
|
||||
opts.checkout_strategy = GIT_CHECKOUT_NONE;
|
||||
git_checkout_tree(g_repo, (git_object*)p_chomped_commit, &opts);
|
||||
cl_assert_equal_i(false, git_path_isfile("testrepo/readme.txt"));
|
||||
|
||||
git_commit_free(p_master_commit);
|
||||
git_commit_free(p_chomped_commit);
|
||||
}
|
||||
|
||||
void test_checkout_tree__can_switch_branches(void)
|
||||
|
||||
@ -144,6 +144,8 @@ void test_clone_nonetwork__custom_autotag(void)
|
||||
|
||||
cl_git_pass(git_tag_list(&tags, g_repo));
|
||||
cl_assert_equal_i(0, tags.count);
|
||||
|
||||
git_strarray_free(&tags);
|
||||
}
|
||||
|
||||
void test_clone_nonetwork__cope_with_already_existing_directory(void)
|
||||
|
||||
@ -18,4 +18,6 @@ void test_config_backend__checks_version(void)
|
||||
cl_git_fail(git_config_add_backend(cfg, &backend, 0, false));
|
||||
err = giterr_last();
|
||||
cl_assert_equal_i(GITERR_INVALID, err->klass);
|
||||
|
||||
git_config_free(cfg);
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user