Gerrit Bot (Gerrit)

unread,

Aug 26, 2022, 5:18:31 AM8/26/22

to goph...@pubsubhelper.golang.org, golang-co...@googlegroups.com

Gerrit Bot has uploaded this change for review.

debug: respect go test flags usage

The `go test` require the package list appear before any flag unknown to the `go test` command.
But `vscode-go` constructs arguments for the go test call with `testify` that doesn't respect the usage.
This PR fixes this problem by filling in the package list first.

Fixes: #1831

Change-Id: Ic2804cc1d061445ddcd95f8217282141627df778
GitHub-Last-Rev: fe6720d3b8ec55927db1a3df38bb44438afde503
GitHub-Pull-Request: golang/vscode-go#2428
---
M src/testUtils.ts
1 file changed, 29 insertions(+), 12 deletions(-)

diff --git a/src/testUtils.ts b/src/testUtils.ts
index e9a43b5..4df9e0b 100644
--- a/src/testUtils.ts
+++ b/src/testUtils.ts
@@ -427,11 +427,14 @@
 	addJSONFlag: boolean | undefined; // true if we add extra -json flag for stream processing.
 } {
 	const args: Array<string> = ['test'];
+	const outArgs:Array<string> = ['test']; // command to show
 	// user-specified flags
 	const argsFlagIdx = testconfig.flags?.indexOf('-args') ?? -1;
 	const userFlags = argsFlagIdx < 0 ? testconfig.flags : testconfig.flags.slice(0, argsFlagIdx);
 	const userArgsFlags = argsFlagIdx < 0 ? [] : testconfig.flags.slice(argsFlagIdx);
 
+	args.push(...targets);
+
 	// flags to limit test time
 	if (testconfig.isBenchmark) {
 		args.push('-benchmem', '-run=^$');
@@ -469,21 +472,12 @@
 	// all other test run/benchmark flags
 	args.push(...targetArgs(testconfig));
 
-	const outArgs = args.slice(0); // command to show
-
 	// if user set -v, set -json to emulate streaming test output
 	const addJSONFlag = (userFlags.includes('-v') || testconfig.goTestOutputConsumer) && !userFlags.includes('-json');
 	if (addJSONFlag) {
 		args.push('-json'); // this is not shown to the user.
 	}
 
-	if (targets.length > 4) {
-		outArgs.push('<long arguments omitted>');
-	} else {
-		outArgs.push(...targets);
-	}
-	args.push(...targets);
-
 	// ensure that user provided flags are appended last (allow use of -args ...)
 	// ignore user provided -run flag if we are already using it
 	if (args.indexOf('-run') > -1) {
@@ -491,10 +485,16 @@
 	}
 
 	args.push(...userFlags);
-	outArgs.push(...userFlags);
-
 	args.push(...userArgsFlags);
-	outArgs.push(...userArgsFlags);
+
+	// build outArgs
+	if (targets.length > 4) {
+		outArgs.push('<long arguments omitted>');
+	} else {
+		outArgs.push(...targets);
+	}
+
+	outArgs.push(...args.slice(targets.length + 1));
 
 	return {
 		args,

To view, visit change 425835. To unsubscribe, or for help writing mail filters, visit settings.

Gopher Robot (Gerrit)

unread,

Aug 26, 2022, 5:19:25 AM8/26/22

to Gerrit Bot, goph...@pubsubhelper.golang.org, golang-co...@googlegroups.com

Congratulations on opening your first change. Thank you for your contribution!

Next steps:
A maintainer will review your change and provide feedback. See
https://go.dev/doc/contribute#review for more info and tips to get your
patch through code review.

Most changes in the Go project go through a few rounds of revision. This can be
surprising to people new to the project. The careful, iterative review process
is our way of helping mentor contributors and ensuring that their contributions
have a lasting impact.

[vscode-go] debug: respect go test flags usage

Gerrit Bot (Gerrit)

Gopher Robot (Gerrit)

Gerrit Bot (Gerrit)

Jamal Carvalho (Gerrit)

kokoro (Gerrit)

Jamal Carvalho (Gerrit)

Gerrit Bot (Gerrit)

Hyang-Ah Hana Kim (Gerrit)

kokoro (Gerrit)

leo steve (Gerrit)

Gerrit Bot (Gerrit)

leo steve (Gerrit)

Jamal Carvalho (Gerrit)

kokoro (Gerrit)

Gerrit Bot (Gerrit)

leo steve (Gerrit)

Jamal Carvalho (Gerrit)

leo steve (Gerrit)

leo steve (Gerrit)

Jamal Carvalho (Gerrit)

kokoro (Gerrit)

Gerrit Bot (Gerrit)

Gerrit Bot uploaded new patchset

Related details

Gerrit Bot (Gerrit)

Gerrit Bot uploaded new patchset

Related details