diff options
| author | Dmitry Vyukov <dvyukov@google.com> | 2020-05-16 14:01:04 +0200 |
|---|---|---|
| committer | Dmitry Vyukov <dvyukov@google.com> | 2020-05-18 11:34:42 +0200 |
| commit | 67206203d3b932828bbcb68b5779a2bdc05158dd (patch) | |
| tree | 4bf3460680e682a916afdeff2969f0e34e4731e5 /pkg | |
| parent | 672c10ad7c2491ae3ab24736fc153e2ecb4c7044 (diff) | |
pkg/runtest: enable 32-bit tests
32-bit tests should work on CI now.
But don't run them in -short mode,
otherwise it takes too long.
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/runtest/run_test.go | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/pkg/runtest/run_test.go b/pkg/runtest/run_test.go index 15c114128..ede757ee8 100644 --- a/pkg/runtest/run_test.go +++ b/pkg/runtest/run_test.go @@ -21,7 +21,12 @@ func Test(t *testing.T) { case "openbsd": t.Skipf("broken on %v", runtime.GOOS) } + // Test only one target in short mode (each takes 5+ seconds to run). + shortTarget := targets.Get("test", "64") for _, sysTarget := range targets.List["test"] { + if testing.Short() && sysTarget != shortTarget { + continue + } sysTarget1 := targets.Get(sysTarget.OS, sysTarget.Arch) t.Run(sysTarget1.Arch, func(t *testing.T) { t.Parallel() @@ -35,10 +40,6 @@ func test(t *testing.T, sysTarget *targets.Target) { if err != nil { t.Fatal(err) } - if testing.Short() && target.PtrSize == 4 { - // Building 32-bit binaries fails on travis (see comments in Makefile). - t.Skip("skipping in short mode") - } executor, err := csource.BuildFile(target, filepath.FromSlash("../../executor/executor.cc")) if err != nil { t.Fatal(err) |