diff options
| -rw-r--r-- | Makefile | 7 | ||||
| -rwxr-xr-x | script/with-less-static.sh | 13 | ||||
| -rw-r--r-- | settings.go (renamed from settings/settings.go) | 48 | ||||
| -rw-r--r-- | settings_test.go (renamed from settings/settings_test.go) | 26 |
4 files changed, 28 insertions, 66 deletions
@@ -2,12 +2,9 @@ default: test build-libgit2: ./script/build-libgit2-static.sh - cat ./vendor/libgit2/libgit2.pc - cat ./vendor/install/lib/pkgconfig/libgit2.pc -test: install build-libgit2 - ./script/with-static.sh go test - ./script/with-less-static.sh go test ./settings +test: build-libgit2 + ./script/with-static.sh go test ./... install: build-libgit2 ./script/with-static.sh go install ./... diff --git a/script/with-less-static.sh b/script/with-less-static.sh deleted file mode 100755 index faaeb01..0000000 --- a/script/with-less-static.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh - -set -ex - -export INSTALL_LOCATION=$PWD/vendor/install -export PKG_CONFIG_PATH=$INSTALL_LOCATION/lib/pkgconfig - -export PCFILE="$PWD/vendor/libgit2/libgit2.pc" - -export CGO_LDFLAGS="$(pkg-config --static --libs $PCFILE)" -export CGO_CFLAGS="$(pkg-config --static --cflags $PCFILE)" - -$@ diff --git a/settings/settings.go b/settings.go index a7f96c7..c7f1850 100644 --- a/settings/settings.go +++ b/settings.go @@ -1,4 +1,4 @@ -package settings +package git /* #include <git2.h> @@ -22,20 +22,14 @@ int _go_git_opts_get_size_t(int opt, size_t *val) { return git_libgit2_opts(opt, val); } - */ import "C" import ( "runtime" "unsafe" - "github.com/libgit2/git2go" ) -func MakeGitError(err C.int) error { - return git.MakeGitError2(int(err)) -} - -func SearchPath(level git.ConfigLevel) (string, error) { +func SearchPath(level ConfigLevel) (string, error) { var buf C.git_buf defer C.git_buf_free(&buf) @@ -50,7 +44,7 @@ func SearchPath(level git.ConfigLevel) (string, error) { return C.GoString(buf.ptr), nil } -func SetSearchPath(level git.ConfigLevel, path string) error { +func SetSearchPath(level ConfigLevel, path string) error { cpath := C.CString(path) defer C.free(unsafe.Pointer(cpath)) @@ -65,12 +59,28 @@ func SetSearchPath(level git.ConfigLevel, path string) error { return nil } +func MwindowSize() (int, error) { + return getSizet(C.GIT_OPT_GET_MWINDOW_SIZE) +} + +func SetMwindowSize(size int) error { + return setSizet(C.GIT_OPT_SET_MWINDOW_SIZE, size) +} + +func MwindowMappedLimit() (int, error) { + return getSizet(C.GIT_OPT_GET_MWINDOW_MAPPED_LIMIT) +} + +func SetMwindowMappedLimit(size int) error { + return setSizet(C.GIT_OPT_SET_MWINDOW_MAPPED_LIMIT, size) +} + func getSizet(opt C.int) (int, error) { runtime.LockOSThread() defer runtime.UnlockOSThread() var val C.size_t - err := C._go_git_opts_get_size_t(opt, &val); + err := C._go_git_opts_get_size_t(opt, &val) if err < 0 { return 0, MakeGitError(err) } @@ -83,26 +93,10 @@ func setSizet(opt C.int, val int) error { defer runtime.UnlockOSThread() cval := C.size_t(val) - err := C._go_git_opts_set_size_t(opt, cval); + err := C._go_git_opts_set_size_t(opt, cval) if err < 0 { return MakeGitError(err) } return nil } - -func MwindowSize() (int, error) { - return getSizet(C.GIT_OPT_GET_MWINDOW_SIZE) -} - -func SetMwindowSize(size int) error { - return setSizet(C.GIT_OPT_SET_MWINDOW_SIZE, size) -} - -func MwindowMappedLimit() (int, error) { - return getSizet(C.GIT_OPT_GET_MWINDOW_MAPPED_LIMIT) -} - -func SetMwindowMappedLimit(size int) error { - return setSizet(C.GIT_OPT_SET_MWINDOW_MAPPED_LIMIT, size) -} diff --git a/settings/settings_test.go b/settings_test.go index 55b08c8..3a4ce0a 100644 --- a/settings/settings_test.go +++ b/settings_test.go @@ -1,21 +1,19 @@ -package settings +package git import ( "testing" - "runtime" - "github.com/libgit2/git2go" ) type pathPair struct { - Level git.ConfigLevel + Level ConfigLevel Path string } func TestSearchPath(t *testing.T) { paths := []pathPair{ - pathPair{git.ConfigLevelSystem, "/tmp/system"}, - pathPair{git.ConfigLevelGlobal, "/tmp/global"}, - pathPair{git.ConfigLevelXDG, "/tmp/xdg"}, + pathPair{ConfigLevelSystem, "/tmp/system"}, + pathPair{ConfigLevelGlobal, "/tmp/global"}, + pathPair{ConfigLevelXDG, "/tmp/xdg"}, } for _, pair := range paths { @@ -50,17 +48,3 @@ func TestMmapSizes(t *testing.T) { t.Fatal("Sizes don't match") } } - -func checkFatal(t *testing.T, err error) { - if err == nil { - return - } - - // The failure happens at wherever we were called, not here - _, file, line, ok := runtime.Caller(1) - if !ok { - t.Fatal() - } - - t.Fatalf("Fail at %v:%v; %v", file, line, err) -} |