Commit 56af46b9 authored by Jacob Vosmaer (GitLab)'s avatar Jacob Vosmaer (GitLab)

Merge branch 'compile-helpers-test' into 'master'

Make "go test" work without path helper



See merge request !57
parents 4d86b01f 56a4377c
PREFIX=/usr/local PREFIX=/usr/local
VERSION=$(shell git describe)-$(shell date -u +%Y%m%d.%H%M%S) VERSION=$(shell git describe)-$(shell date -u +%Y%m%d.%H%M%S)
export GOPATH=$(shell pwd)/_build BUILD_DIR = $(shell pwd)
export GOPATH=${BUILD_DIR}/_build
GOBUILD=go build -ldflags "-X main.Version=${VERSION}" GOBUILD=go build -ldflags "-X main.Version=${VERSION}"
PKG=gitlab.com/gitlab-org/gitlab-workhorse PKG=gitlab.com/gitlab-org/gitlab-workhorse
all: clean-build gitlab-zip-cat gitlab-zip-metadata gitlab-workhorse all: clean-build gitlab-zip-cat gitlab-zip-metadata gitlab-workhorse
gitlab-zip-cat: _build $(shell find cmd/gitlab-zip-cat/ -name '*.go') gitlab-zip-cat: ${BUILD_DIR}/_build $(shell find cmd/gitlab-zip-cat/ -name '*.go')
${GOBUILD} -o $@ ${PKG}/cmd/$@ ${GOBUILD} -o ${BUILD_DIR}/$@ ${PKG}/cmd/$@
gitlab-zip-metadata: _build $(shell find cmd/gitlab-zip-metadata/ -name '*.go') gitlab-zip-metadata: ${BUILD_DIR}/_build $(shell find cmd/gitlab-zip-metadata/ -name '*.go')
${GOBUILD} -o $@ ${PKG}/cmd/$@ ${GOBUILD} -o ${BUILD_DIR}/$@ ${PKG}/cmd/$@
gitlab-workhorse: _build $(shell find . -name '*.go' | grep -v '^\./_') gitlab-workhorse: ${BUILD_DIR}/_build $(shell find . -name '*.go' | grep -v '^\./_')
${GOBUILD} -o $@ ${PKG} ${GOBUILD} -o ${BUILD_DIR}/$@ ${PKG}
install: gitlab-workhorse gitlab-zip-cat gitlab-zip-metadata install: gitlab-workhorse gitlab-zip-cat gitlab-zip-metadata
mkdir -p $(DESTDIR)${PREFIX}/bin/ mkdir -p $(DESTDIR)${PREFIX}/bin/
install gitlab-workhorse gitlab-zip-cat gitlab-zip-metadata ${DESTDIR}${PREFIX}/bin/ cd ${BUILD_DIR} && install gitlab-workhorse gitlab-zip-cat gitlab-zip-metadata ${DESTDIR}${PREFIX}/bin/
_build: ${BUILD_DIR}/_build:
mkdir -p $@/src/${PKG} mkdir -p $@/src/${PKG}
tar -cf - --exclude $@ --exclude .git . | (cd $@/src/${PKG} && tar -xf -) tar -cf - --exclude _build --exclude .git . | (cd $@/src/${PKG} && tar -xf -)
touch $@ touch $@
.PHONY: test .PHONY: test
test: clean-build clean-workhorse all test: clean-build clean-workhorse all
go fmt ${PKG}/... | awk '{ print } END { if (NR > 0) { print "Please run go fmt"; exit 1 } }' go fmt ${PKG}/... | awk '{ print } END { if (NR > 0) { print "Please run go fmt"; exit 1 } }'
_support/path go test ${PKG}/... go test ${PKG}/...
@echo SUCCESS @echo SUCCESS
coverage: coverage:
...@@ -44,8 +45,8 @@ clean: clean-workhorse clean-build ...@@ -44,8 +45,8 @@ clean: clean-workhorse clean-build
.PHONY: clean-workhorse .PHONY: clean-workhorse
clean-workhorse: clean-workhorse:
rm -f gitlab-workhorse gitlab-zip-cat gitlab-zip-metadata cd ${BUILD_DIR} && rm -f gitlab-workhorse gitlab-zip-cat gitlab-zip-metadata
.PHONY: clean-build .PHONY: clean-build
clean-build: clean-build:
rm -rf _build rm -rf ${BUILD_DIR}/_build
#!/bin/sh
exec env PATH=$(pwd):${PATH} "$@"
package artifacts
import (
"log"
"os"
"testing"
"gitlab.com/gitlab-org/gitlab-workhorse/internal/testhelper"
)
func TestMain(m *testing.M) {
cleanup, err := testhelper.BuildExecutables()
if err != nil {
log.Printf("Test setup: failed to build executables: %v", err)
os.Exit(1)
}
os.Exit(func() int {
defer cleanup()
return m.Run()
}())
}
package testhelper package testhelper
import ( import (
"errors"
"fmt"
"io/ioutil"
"log" "log"
"net/http" "net/http"
"net/http/httptest" "net/http/httptest"
"os"
"os/exec"
"path"
"regexp" "regexp"
"runtime"
"testing" "testing"
) )
...@@ -43,3 +50,38 @@ func TestServerWithHandler(url *regexp.Regexp, handler http.HandlerFunc) *httpte ...@@ -43,3 +50,38 @@ func TestServerWithHandler(url *regexp.Regexp, handler http.HandlerFunc) *httpte
handler(w, r) handler(w, r)
})) }))
} }
func BuildExecutables() (func(), error) {
_, currentFile, _, ok := runtime.Caller(0)
if !ok {
return nil, errors.New("BuildExecutables: calling runtime.Caller failed")
}
rootDir := path.Join(path.Dir(currentFile), "../..")
// This method will be invoked more than once due to Go test
// parallelization. We must use a unique temp directory for each
// invokation so that they do not trample each other's builds.
testDir, err := ioutil.TempDir("", "gitlab-workhorse-test")
if err != nil {
return nil, errors.New("could not create temp directory")
}
makeCmd := exec.Command("make", "BUILD_DIR="+testDir)
makeCmd.Dir = rootDir
makeCmd.Stderr = os.Stderr
makeCmd.Stdout = os.Stdout
if err := makeCmd.Run(); err != nil {
return nil, fmt.Errorf("failed to run %v in %v", makeCmd, rootDir)
}
oldPath := os.Getenv("PATH")
testPath := fmt.Sprintf("%s:%s", testDir, oldPath)
if err := os.Setenv("PATH", testPath); err != nil {
return nil, fmt.Errorf("failed to set PATH to %v", testPath)
}
return func() {
os.Setenv("PATH", oldPath)
os.RemoveAll(testDir)
}, nil
}
...@@ -43,11 +43,21 @@ func TestMain(m *testing.M) { ...@@ -43,11 +43,21 @@ func TestMain(m *testing.M) {
testCmd.Stderr = os.Stderr testCmd.Stderr = os.Stderr
if err := testCmd.Run(); err != nil { if err := testCmd.Run(); err != nil {
log.Printf("Test setup: failed to run %v", testCmd)
os.Exit(-1) os.Exit(-1)
} }
} }
os.Exit(m.Run()) cleanup, err := testhelper.BuildExecutables()
if err != nil {
log.Printf("Test setup: failed to build executables: %v", err)
os.Exit(1)
}
os.Exit(func() int {
defer cleanup()
return m.Run()
}())
} }
func TestAllowedClone(t *testing.T) { func TestAllowedClone(t *testing.T) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment