Merge pull request #19 from schibsted/gcc-9

Add fixes for GCC 9 and Go 1.14.

core/test/sapp/sapp-tests/main.go

@@ -11,6 +11,7 @@ import (
 	"net/http/httptrace"
 	"os"
 	"os/exec"
+	"runtime"
 
 	"github.com/schibsted/sebase/core/pkg/fd_pool"
 	"github.com/schibsted/sebase/core/pkg/sapp"
@@ -21,7 +22,9 @@ var app sapp.Sapp
 const dialDomain = "foobar"
 const bodyOk = "Hello, world!\n"
 const bodyDenied = "Forbidden by ACL\n"
-const getFailLog = "client.Do failed: Get https://sapp-test-server-log.foobar:8080/panic: EOF"
+const getFailLog113 = "client.Do failed: Get https://sapp-test-server-log.foobar:8080/panic: EOF"
+
+var getFailLog = `client.Do failed: Get "https://sapp-test-server-log.foobar:8080/panic": EOF`
 
 func main() {
 	app.Flags("", true)
@@ -31,6 +34,10 @@ func main() {
 
 	app.Pool.SetDialDomain(dialDomain)
 
+	if runtime.Version() < "go1.14" {
+		getFailLog = getFailLog113
+	}
+
 	var tests = []struct {
 		service  string
 		method   string

plog/plugins/elasticsearch/Builddesc

@@ -1,6 +1,8 @@
 GOMODULE(elasticsearch
+	enabled::!nocgo[]
 	destdir[lib/plogd/plugins]
 )
 
 GOTEST(sebase-plog-elasticsearch
+	enabled::!nocgo[]
 )

test/test.dockerfile

@@ -5,8 +5,8 @@ FROM ubuntu:xenial
 ENV PATH=/root/go/bin:/usr/local/go/bin:$PATH
 
 RUN apt-get update && apt-get install -y curl etcd g++ gcc git gperf jq libbsd-dev libcurl4-openssl-dev libicu-dev libpcre3-dev libssl-dev libyajl-dev make ninja-build protobuf-c-compiler python && apt-get clean
-RUN curl https://dl.google.com/go/go1.12.5.linux-amd64.tar.gz | tar -C /usr/local -xzf -
-RUN go get github.com/schibsted/sebuild/cmd/seb
+RUN curl https://dl.google.com/go/go1.14.2.linux-amd64.tar.gz | tar -C /usr/local -xzf -
+RUN GO111MODULE=on go get github.com/schibsted/sebuild/v2/cmd/seb
 # Python is only needed for test, should try to remove it maybe.
 
 # Trick etcd into sending systemd notifications like we want.

util/lib/Builddesc

@@ -31,4 +31,7 @@ LIB(sebase-util
 	libs::linux[
 		bsd
 	]
+	srcopts::gcc[
+		aes.c:-Wno-stringop-truncation
+	]
 )

util/test/string-functions/str.c

@@ -53,7 +53,7 @@ test_p(void) {
 
 	if ((res = strstrptrs(haystack, needle, needle + strlen(needle), ":")) != NULL)
 		return 0;
-	fprintf(stderr, "Non-match failed (%s)\n", res);
+	fprintf(stderr, "Non-match failed\n");
 	return 1;
 }