From bb510037beaaaa723b9158d1f4e11a3547f6fb73 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 24 Feb 2021 14:08:46 -0800 Subject: [PATCH] selftest: Replace building dep tool with direnv dep tool is now deprecated and its replaced with go modules so using this as sample for testing is also getting arcane. Replace it with another project direnv[1] which is quite active and uptodate [1] https://github.com/direnv/direnv Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/cases/gotoolchain.py | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/meta/lib/oeqa/selftest/cases/gotoolchain.py b/meta/lib/oeqa/selftest/cases/gotoolchain.py index 3119520f0de..4fc3605f42f 100644 --- a/meta/lib/oeqa/selftest/cases/gotoolchain.py +++ b/meta/lib/oeqa/selftest/cases/gotoolchain.py @@ -46,26 +46,25 @@ class oeGoToolchainSelfTest(OESelftestTestCase): shutil.rmtree(cls.tmpdir_SDKQA, ignore_errors=True) super(oeGoToolchainSelfTest, cls).tearDownClass() - def run_sdk_go_command(self, gocmd): - cmd = "cd %s; " % self.tmpdir_SDKQA + def run_sdk_go_command(self, gocmd, proj, name): + cmd = "cd %s/src/%s/%s; " % (self.go_path, proj, name) cmd = cmd + ". %s; " % self.env_SDK cmd = cmd + "export GOPATH=%s; " % self.go_path cmd = cmd + "${CROSS_COMPILE}go %s" % gocmd return runCmd(cmd).status def test_go_dep_build(self): - proj = "github.com/golang" - name = "dep" - ver = "v0.3.1" + proj = "github.com/direnv" + name = "direnv" + ver = "v2.27.0" archive = ".tar.gz" url = "https://%s/%s/archive/%s%s" % (proj, name, ver, archive) runCmd("cd %s; wget %s" % (self.tmpdir_SDKQA, url)) runCmd("cd %s; tar -xf %s" % (self.tmpdir_SDKQA, ver+archive)) runCmd("mkdir -p %s/src/%s" % (self.go_path, proj)) - runCmd("mv %s/dep-0.3.1 %s/src/%s/%s" + runCmd("mv %s/direnv-2.27.0 %s/src/%s/%s" % (self.tmpdir_SDKQA, self.go_path, proj, name)) - retv = self.run_sdk_go_command('build %s/%s/cmd/dep' - % (proj, name)) + retv = self.run_sdk_go_command('build', proj, name) self.assertEqual(retv, 0, msg="Running go build failed for %s" % name) -- 2.47.2