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.

Sign up for GitHub

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

Jump to bottom

Fork dev.boringcrypto from main #384

Closed
wants to merge 3 commits into from
Closed

Fork dev.boringcrypto from main #384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7ed84e6
Fork dev.boringcrypto from main
dagood Jan 28, 2022
a3e923b
Extend test timeout for slower build agents
dagood Jan 29, 2022
3f9558d
Add patch making timeout adjustment affect cgo tests
dagood Jan 31, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions eng/_core/cmd/build/build.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,11 @@ func build(o *options) error {
}
}

// Extend the test timeout to allow slower build agents.
if err := os.Setenv("GO_TEST_TIMEOUT_SCALE", "10"); err != nil {
return err
}

// "-json": Get test results as lines of JSON.
if o.JSON {
testCommandLine = append(testCommandLine, "-json")
Expand Down
3 changes: 3 additions & 0 deletions eng/_util/cmd/run-builder/run-builder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,9 @@ func main() {
env("GOEXPERIMENT", "staticlockranking")
}

// Extend the test timeout to allow slower build agents.
env("GO_TEST_TIMEOUT_SCALE", "10")

runOrPanic("pwsh", "eng/run.ps1", "build")

// After the build completes, run builder-specific commands.
Expand Down
2 changes: 1 addition & 1 deletion go
Open in desktop
Submodule go updated 1391 files
4 changes: 2 additions & 2 deletions patches/0001-cmd-dist-add-JSON-output-support-for-some-tests.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From be418f20052ddea746451bafe21fdbf2bb1c915d Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Davis Goodin <dagood@microsoft.com>
Date: Tue, 4 Jan 2022 11:23:27 -0600
Subject: [PATCH] cmd/dist: add JSON output support for some tests
Expand All @@ -17,7 +17,7 @@ in JSON format, and the ordinary logs are still important.
1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/cmd/dist/test.go b/src/cmd/dist/test.go
index 50a2e5936c..0436c63063 100644
index 98e30a158f..518b35c53a 100644
--- a/src/cmd/dist/test.go
+++ b/src/cmd/dist/test.go
@@ -29,6 +29,7 @@ func cmdtest() {
Expand Down
24 changes: 24 additions & 0 deletions patches/0002-cmd-dist-add-explicit-default-timeout-for-cgo.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Davis Goodin <dagood@microsoft.com>
Date: Mon, 31 Jan 2022 15:48:37 -0600
Subject: [PATCH] cmd/dist: add explicit default timeout for cgo

Add "t.timeout" call to cgo test command with the default value, 600.
This makes GO_TEST_TIMEOUT_SCALE have an effect on cgo test timeout.
---
src/cmd/dist/test.go | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cmd/dist/test.go b/src/cmd/dist/test.go
index 518b35c53a..b63bf1fcdc 100644
--- a/src/cmd/dist/test.go
+++ b/src/cmd/dist/test.go
@@ -1136,7 +1136,7 @@ func (t *tester) runHostTest(dir, pkg string) error {
}

func (t *tester) cgoTest(dt *distTest) error {
- cmd := t.addCmd(dt, "misc/cgo/test", t.goTest())
+ cmd := t.addCmd(dt, "misc/cgo/test", t.goTest(), t.timeout(600))
setEnv(cmd, "GOFLAGS", "-ldflags=-linkmode=auto")

// Skip internal linking cases on linux/arm64 to support GCC-9.4 and above.