From: Michael Matloob <matloob@golang.org>
Date: Wed, 8 Jun 2022 23:14:11 +0000 (-0400)
Subject: cmd/go/testdata/script: fix skip on list_replace_absolute_windows
X-Git-Tag: go1.19beta1~5
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=b51d44c6dd;p=gostls13.git

cmd/go/testdata/script: fix skip on list_replace_absolute_windows

The test should skip if it's not on windows *or* it's a short test, but
instead is now skipping if it's not on windows *and* it's a short test,
causing it to be run on non-windows longtest builders.

Change-Id: Ica011bab632b713b0564fefabd5b42878d401844
Reviewed-on: https://go-review.googlesource.com/c/go/+/411122
Reviewed-by: Heschi Kreinick <heschi@google.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
Reviewed-by: Cherry Mui <cherryyz@google.com>
Run-TryBot: Michael Matloob <matloob@golang.org>
Auto-Submit: Michael Matloob <matloob@golang.org>
---

diff --git a/src/cmd/go/testdata/script/list_replace_absolute_windows.txt b/src/cmd/go/testdata/script/list_replace_absolute_windows.txt
index 6f5d737ade..b3ff2a7c2d 100644
--- a/src/cmd/go/testdata/script/list_replace_absolute_windows.txt
+++ b/src/cmd/go/testdata/script/list_replace_absolute_windows.txt
@@ -3,7 +3,8 @@
 # whether the modindex logic cleans the modroot path before using
 # it.
 
-[!windows] [short] skip
+[!windows] skip
+[short] skip
 
 go run print_go_mod.go # use this program to write a go.mod with an absolute path
 cp stdout go.mod