From d0d8e49e203121370e9ceba2187c697c493d5b56 Mon Sep 17 00:00:00 2001 From: Yiqiao Pu Date: Mon, 15 Aug 2016 16:51:45 +0800 Subject: [PATCH] e2e: Update binary path with binDir Signed-off-by: Yiqiao Pu --- e2e/ctl_v2_test.go | 2 +- e2e/etcd_release_upgrade_test.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/e2e/ctl_v2_test.go b/e2e/ctl_v2_test.go index 355c6d82c..31ae2a31e 100644 --- a/e2e/ctl_v2_test.go +++ b/e2e/ctl_v2_test.go @@ -427,7 +427,7 @@ func etcdctlBackup(clus *etcdProcessCluster, dataDir, backupDir string) error { } func mustEtcdctl(t *testing.T) { - if !fileutil.Exist("../bin/etcdctl") { + if !fileutil.Exist(binDir + "/etcdctl") { t.Fatalf("could not find etcdctl binary") } } diff --git a/e2e/etcd_release_upgrade_test.go b/e2e/etcd_release_upgrade_test.go index d31a28218..78c51e022 100644 --- a/e2e/etcd_release_upgrade_test.go +++ b/e2e/etcd_release_upgrade_test.go @@ -27,7 +27,7 @@ import ( // TestReleaseUpgrade ensures that changes to master branch does not affect // upgrade from latest etcd releases. func TestReleaseUpgrade(t *testing.T) { - lastReleaseBinary := "../bin/etcd-last-release" + lastReleaseBinary := binDir + "/etcd-last-release" if !fileutil.Exist(lastReleaseBinary) { t.Skipf("%q does not exist", lastReleaseBinary) } @@ -72,7 +72,7 @@ func TestReleaseUpgrade(t *testing.T) { if err := epc.procs[i].Stop(); err != nil { t.Fatalf("#%d: error closing etcd process (%v)", i, err) } - epc.procs[i].cfg.execPath = "../bin/etcd" + epc.procs[i].cfg.execPath = binDir + "/etcd" epc.procs[i].cfg.keepDataDir = true if err := epc.procs[i].Restart(); err != nil {