cmd/govulncheck: organize tests into subdirs

This change does not modify any tests, but organizes the preexisting
tests into subdirectories.

Change-Id: Id0634f646eae0aa9eceb98269acec2a76bbb2a6c
Reviewed-on: https://go-review.googlesource.com/c/vuln/+/539662
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Reviewed-by: Zvonimir Pavlinovic <zpavlinovic@google.com>

Author: Maceo Thompson

cmd/govulncheck/main_test.go

@@ -153,10 +153,10 @@ func TestCommand(t *testing.T) {
 		varName := filepath.Base(md) + "_binary"
 		os.Setenv(varName, binary)
 	}
-	runTestSuite(t, filepath.Join(testDir, "testdata"), govulndbURI.String(), *update)
+	runTestSuite(t, filepath.Join(testDir, "testdata", "testfiles"), govulndbURI.String(), *update)
 	if runtime.GOOS != "darwin" {
 		// Binaries are not stripped on darwin with go1.21 and earlier. See #61051.
-		runTestSuite(t, filepath.Join(testDir, "testdata/strip"), govulndbURI.String(), *update)
+		runTestSuite(t, filepath.Join(testDir, "testdata", "strip"), govulndbURI.String(), *update)
 	}
 }
 
@@ -190,7 +190,7 @@ func runTestSuite(t *testing.T, dir string, govulndb string, update bool) {
 		parallelLimiter = make(chan struct{}, limit)
 	})
 
-	ts, err := cmdtest.Read(dir)
+	ts, err := cmdtest.Read(filepath.Join(dir, "*"))
 	if err != nil {
 		t.Fatal(err)
 	}

cmd/govulncheck/testdata/binary_json.ct renamed to cmd/govulncheck/testdata/testfiles/binary/binary_json.ct

@@ -1,6 +1,7 @@
 #####
 # Test using the conversion from json on stdin to text on stdout
-$ govulncheck -mode=convert < convert_input.json --> FAIL 3
+# location of convert input is subdirectory/convert_intput
+$ govulncheck -mode=convert < convert/convert_input.json --> FAIL 3
 Scanning your code and P packages across M dependent modules for known vulnerabilities...
 
 Vulnerability #1: GO-2021-0265