diff --git a/Makefile b/Makefile index ee0c3fd9b..c6352c776 100644 --- a/Makefile +++ b/Makefile @@ -157,7 +157,7 @@ test-smoke: test-full: $(info log-file: test-$(TEST_SUFFIX).log) - PASSES="fmt build unit integration functional e2e grpcproxy" ./test.sh 2<&1 | tee test-$(TEST_SUFFIX).log + PASSES="fmt build release unit integration functional e2e grpcproxy" ./test.sh 2<&1 | tee test-$(TEST_SUFFIX).log docker-test: $(info GO_VERSION: $(GO_VERSION)) diff --git a/test.sh b/test.sh index 715b335d2..2726255ca 100755 --- a/test.sh +++ b/test.sh @@ -613,7 +613,7 @@ function dep_pass { function release_pass { rm -f ./bin/etcd-last-release # to grab latest patch release; bump this up for every minor release - UPGRADE_VER=$(git tag -l --sort=-version:refname "v3.3.*" | head -1) + UPGRADE_VER=$(git tag -l --sort=-version:refname "v3.4.*" | head -1) if [ -n "$MANUAL_VER" ]; then # in case, we need to test against different version UPGRADE_VER=$MANUAL_VER diff --git a/tests/e2e/main_test.go b/tests/e2e/main_test.go index 791c9d58e..75adb1e8e 100644 --- a/tests/e2e/main_test.go +++ b/tests/e2e/main_test.go @@ -6,7 +6,9 @@ package e2e import ( "flag" + "log" "os" + "path/filepath" "runtime" "testing" @@ -36,8 +38,18 @@ func TestMain(m *testing.M) { os.Setenv("ETCD_UNSUPPORTED_ARCH", runtime.GOARCH) os.Unsetenv("ETCDCTL_API") - flag.StringVar(&binDir, "bin-dir", "../../bin", "The directory for store etcd and etcdctl binaries.") - flag.StringVar(&certDir, "cert-dir", "../fixtures", "The directory for store certificate files.") + binDirDef, err := filepath.Abs("../../bin") + if err != nil { + log.Fatal(err) + } + + certDirDef, err := filepath.Abs("../fixtures") + if err != nil { + log.Fatal(err) + } + + flag.StringVar(&binDir, "bin-dir", binDirDef, "The directory for store etcd and etcdctl binaries.") + flag.StringVar(&certDir, "cert-dir", certDirDef, "The directory for store certificate files.") flag.Parse() binPath = binDir + "/etcd"