Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove gccgo support #25978

Merged
merged 2 commits into from Aug 25, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
104 changes: 0 additions & 104 deletions Dockerfile.gccgo

This file was deleted.

8 changes: 1 addition & 7 deletions Makefile
@@ -1,4 +1,4 @@
.PHONY: all binary build build-gccgo cross deb docs gccgo help init-go-pkg-cache install manpages rpm run shell test test-docker-py test-integration-cli tgz test-unit validate win
.PHONY: all binary build cross deb docs help init-go-pkg-cache install manpages rpm run shell test test-docker-py test-integration-cli tgz test-unit validate win

# set the graph driver as the current graphdriver if not set
DOCKER_GRAPHDRIVER := $(if $(DOCKER_GRAPHDRIVER),$(DOCKER_GRAPHDRIVER),$(shell docker info 2>&1 | grep "Storage Driver" | sed 's/.*: //'))
Expand Down Expand Up @@ -80,9 +80,6 @@ binary: build ## build the linux binaries
build: bundles init-go-pkg-cache
docker build ${DOCKER_BUILD_ARGS} -t "$(DOCKER_IMAGE)" -f "$(DOCKERFILE)" .

build-gccgo: bundles init-go-pkg-cache
docker build ${DOCKER_BUILD_ARGS} -t "$(DOCKER_IMAGE)-gccgo" -f Dockerfile.gccgo .

bundles:
mkdir bundles

Expand All @@ -104,9 +101,6 @@ deb: build ## build the deb packages
docs: ## build the docs
$(MAKE) -C docs docs

gccgo: build-gccgo ## build the gcc-go linux binaries
$(DOCKER_FLAGS) "$(DOCKER_IMAGE)-gccgo" hack/make.sh gccgo

install: ## install the linux binaries
KEEPBUNDLE=1 hack/make.sh install-binary

Expand Down
2 changes: 1 addition & 1 deletion hack/make/.integration-daemon-start
Expand Up @@ -3,7 +3,7 @@
# see test-integration-cli for example usage of this script

base="$ABS_DEST/.."
export PATH="$base/binary-client:$base/binary-daemon:$base/dynbinary-client:$base/dynbinary-daemon:$base/gccgo:$base/dyngccgo:$PATH"
export PATH="$base/binary-client:$base/binary-daemon:$base/dynbinary-client:$base/dynbinary-daemon:$PATH"

if ! command -v docker &> /dev/null; then
echo >&2 'error: binary-client or dynbinary-client must be run before .integration-daemon-start'
Expand Down
7 changes: 1 addition & 6 deletions hack/make/cover
Expand Up @@ -12,9 +12,4 @@ bundle_cover() {
done
}

if [ "$HAVE_GO_TEST_COVER" ]; then
bundle_cover 2>&1 | tee "$DEST/report.log"
else
echo >&2 'warning: the current version of go does not support -cover'
echo >&2 ' skipping test coverage report'
fi
bundle_cover 2>&1 | tee "$DEST/report.log"
11 changes: 0 additions & 11 deletions hack/make/dyngccgo

This file was deleted.

68 changes: 0 additions & 68 deletions hack/make/gccgo

This file was deleted.

8 changes: 1 addition & 7 deletions hack/make/test-unit
Expand Up @@ -34,13 +34,7 @@ bundle_test_unit() {
| grep -v github.com/docker/docker/vendor \
| grep -v github.com/docker/docker/man \
| grep -v github.com/docker/docker/integration-cli)
go test $COVER $GCCGOFLAGS -ldflags "$LDFLAGS" "${BUILDFLAGS[@]}" $TESTFLAGS $pkg_list
go test -cover -ldflags "$LDFLAGS" "${BUILDFLAGS[@]}" $TESTFLAGS $pkg_list
}


if [[ "$(go version)" == *"gccgo"* ]]; then
GCCGOFLAGS=-gccgoflags="-lpthread"
else
COVER=-cover
fi
bundle_test_unit 2>&1 | tee -a "$DEST/test.log"
4 changes: 2 additions & 2 deletions integration-cli/docker_cli_events_unix_test.go
Expand Up @@ -47,7 +47,7 @@ func (s *DockerSuite) TestEventsRedirectStdout(c *check.C) {
}

func (s *DockerSuite) TestEventsOOMDisableFalse(c *check.C) {
testRequires(c, DaemonIsLinux, oomControl, memoryLimitSupport, NotGCCGO, swapMemorySupport)
testRequires(c, DaemonIsLinux, oomControl, memoryLimitSupport, swapMemorySupport)

errChan := make(chan error)
go func() {
Expand Down Expand Up @@ -77,7 +77,7 @@ func (s *DockerSuite) TestEventsOOMDisableFalse(c *check.C) {
}

func (s *DockerSuite) TestEventsOOMDisableTrue(c *check.C) {
testRequires(c, DaemonIsLinux, oomControl, memoryLimitSupport, NotGCCGO, NotArm, swapMemorySupport)
testRequires(c, DaemonIsLinux, oomControl, memoryLimitSupport, NotArm, swapMemorySupport)

errChan := make(chan error)
observer, err := newEventObserver(c)
Expand Down
2 changes: 1 addition & 1 deletion integration-cli/docker_cli_run_test.go
Expand Up @@ -3507,7 +3507,7 @@ func (s *DockerSuite) TestPtraceContainerProcsFromHost(c *check.C) {

func (s *DockerSuite) TestAppArmorDeniesPtrace(c *check.C) {
// Not applicable on Windows as uses Unix specific functionality
testRequires(c, SameHostDaemon, Apparmor, DaemonIsLinux, NotGCCGO)
testRequires(c, SameHostDaemon, Apparmor, DaemonIsLinux)

// Run through 'sh' so we are NOT pid 1. Pid 1 may be able to trace
// itself, but pid>1 should not be able to trace pid1.
Expand Down
3 changes: 1 addition & 2 deletions integration-cli/docker_cli_run_unix_test.go
Expand Up @@ -611,8 +611,7 @@ func (s *DockerSuite) TestRunOOMExitCode(c *check.C) {
errChan := make(chan error)
go func() {
defer close(errChan)
//changing memory to 40MB from 4MB due to an issue with GCCGO that test fails to start the container.
out, exitCode, _ := dockerCmdWithError("run", "-m", "40MB", "busybox", "sh", "-c", "x=a; while true; do x=$x$x$x$x; done")
out, exitCode, _ := dockerCmdWithError("run", "-m", "4MB", "busybox", "sh", "-c", "x=a; while true; do x=$x$x$x$x; done")
if expected := 137; exitCode != expected {
errChan <- fmt.Errorf("wrong exit code for OOM container: expected %d, got %d (output: %q)", expected, exitCode, out)
}
Expand Down
10 changes: 0 additions & 10 deletions integration-cli/requirements.go
Expand Up @@ -153,16 +153,6 @@ var (
},
"Test requires support for IPv6",
}
NotGCCGO = testRequirement{
func() bool {
out, err := exec.Command("go", "version").Output()
if err == nil && strings.Contains(string(out), "gccgo") {
return false
}
return true
},
"Test requires native Golang compiler instead of GCCGO",
}
UserNamespaceInKernel = testRequirement{
func() bool {
if _, err := os.Stat("/proc/self/uid_map"); os.IsNotExist(err) {
Expand Down