diff options
| author | Kir Kolyshkin <kolyshkin@gmail.com> | 2024-08-29 19:06:57 -0700 |
|---|---|---|
| committer | Damien Neil <dneil@google.com> | 2024-09-03 18:03:28 +0000 |
| commit | 6fa224a80965a32228f9bc13cfe667af500d0a9d (patch) | |
| tree | bc8fd767d201982bfe61651a8069f2df1216c90d /src/testing/testing_test.go | |
| parent | f26c29723f372284ff7dc0dbf30bae5561a3e618 (diff) | |
| download | go-6fa224a80965a32228f9bc13cfe667af500d0a9d.tar.xz | |
testing: use testenv.Executable
Note that this changes some nuances of how the tests work:
- some tests had a fallback to using os.Args[0], which is removed;
- some tests skipped (rather than failed) the test upon getting an
error from os.Executable.
I think these changes are not practically relevant.
Change-Id: I0655add6d959a8b7e3359f94c38203aa06e8f490
Reviewed-on: https://go-review.googlesource.com/c/go/+/609303
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Reviewed-by: Damien Neil <dneil@google.com>
Reviewed-by: Alan Donovan <adonovan@google.com>
Auto-Submit: Ian Lance Taylor <iant@google.com>
Reviewed-by: Ian Lance Taylor <iant@google.com>
Diffstat (limited to 'src/testing/testing_test.go')
| -rw-r--r-- | src/testing/testing_test.go | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/src/testing/testing_test.go b/src/testing/testing_test.go index f53c233905..d62455baa8 100644 --- a/src/testing/testing_test.go +++ b/src/testing/testing_test.go @@ -440,12 +440,7 @@ func runTest(t *testing.T, test string) []byte { testenv.MustHaveExec(t) - exe, err := os.Executable() - if err != nil { - t.Skipf("can't find test executable: %v", err) - } - - cmd := testenv.Command(t, exe, "-test.run=^"+test+"$", "-test.bench="+test, "-test.v", "-test.parallel=2", "-test.benchtime=2x") + cmd := testenv.Command(t, testenv.Executable(t), "-test.run=^"+test+"$", "-test.bench="+test, "-test.v", "-test.parallel=2", "-test.benchtime=2x") cmd = testenv.CleanCmdEnv(cmd) cmd.Env = append(cmd.Env, "GO_WANT_HELPER_PROCESS=1") out, err := cmd.CombinedOutput() @@ -674,14 +669,7 @@ func TestRaceBeforeParallel(t *testing.T) { } func TestRaceBeforeTests(t *testing.T) { - testenv.MustHaveExec(t) - - exe, err := os.Executable() - if err != nil { - t.Skipf("can't find test executable: %v", err) - } - - cmd := testenv.Command(t, exe, "-test.run=^$") + cmd := testenv.Command(t, testenv.Executable(t), "-test.run=^$") cmd = testenv.CleanCmdEnv(cmd) cmd.Env = append(cmd.Env, "GO_WANT_RACE_BEFORE_TESTS=1") out, _ := cmd.CombinedOutput() |