Merge pull request #17671 from hvitved/go/fix-tests

Go: Update expected test output

Author: smowton

go/ql/test/library-tests/semmle/go/PrintAst/PrintAst.expected

@@ -1,9 +1,9 @@
 go.mod:
-#    0| [GoModFile] library-tests/semmle/go/PrintAst/go.mod
+#    0| [GoModFile] go.mod
 #    1|   0: [GoModModuleLine] go.mod module line
 #    3|   1: [GoModGoLine] go.mod go line
 input.go:
-#    0| [GoFile] library-tests/semmle/go/PrintAst/input.go
+#    0| [GoFile] input.go
 #    1|   package: [Ident] main
 #    5|   1: [CommentGroup] comment group
 #    5|     0: [SlashSlashComment] comment
@@ -597,7 +597,7 @@ input.go:
 #  145|             Type = []int
 #  145|         1: [BlockStmt] block statement
 other.go:
-#    0| [GoFile] library-tests/semmle/go/PrintAst/other.go
+#    0| [GoFile] other.go
 #    1|   package: [Ident] main
 #    3|   1: [FuncDecl] function declaration
 #    3|     0: [FunctionName, Ident] main

go/ql/test/library-tests/semmle/go/PrintAst/PrintAstExcludeComments.expected

@@ -1,9 +1,9 @@
 go.mod:
-#    0| [GoModFile] library-tests/semmle/go/PrintAst/go.mod
+#    0| [GoModFile] go.mod
 #    1|   0: [GoModModuleLine] go.mod module line
 #    3|   1: [GoModGoLine] go.mod go line
 input.go:
-#    0| [GoFile] library-tests/semmle/go/PrintAst/input.go
+#    0| [GoFile] input.go
 #    1|   package: [Ident] main
 #    3|   1: [ImportDecl] import declaration
 #    3|     0: [ImportSpec] import specifier
@@ -577,7 +577,7 @@ input.go:
 #  145|             Type = []int
 #  145|         1: [BlockStmt] block statement
 other.go:
-#    0| [GoFile] library-tests/semmle/go/PrintAst/other.go
+#    0| [GoFile] other.go
 #    1|   package: [Ident] main
 #    3|   1: [FuncDecl] function declaration
 #    3|     0: [FunctionName, Ident] main

go/ql/test/library-tests/semmle/go/PrintAst/PrintAstNestedFunction.expected

@@ -1,9 +1,9 @@
 go.mod:
-#    0| [GoModFile] library-tests/semmle/go/PrintAst/go.mod
+#    0| [GoModFile] go.mod
 #    1|   0: [GoModModuleLine] go.mod module line
 #    3|   1: [GoModGoLine] go.mod go line
 input.go:
-#    0| [GoFile] library-tests/semmle/go/PrintAst/input.go
+#    0| [GoFile] input.go
 #    1|   package: [Ident] main
 #    5|   1: [CommentGroup] comment group
 #    5|     0: [SlashSlashComment] comment
@@ -29,7 +29,7 @@ input.go:
 #    3|     0: [ImportSpec] import specifier
 #    3|       0: [StringLit] "fmt"
 other.go:
-#    0| [GoFile] library-tests/semmle/go/PrintAst/other.go
+#    0| [GoFile] other.go
 #    1|   package: [Ident] main
 #    8|   1: [FuncDecl] function declaration
 #    8|     0: [FunctionName, Ident] hasNested

go/ql/test/library-tests/semmle/go/PrintAst/PrintAstRestrictFile.expected

@@ -1,5 +1,5 @@
 other.go:
-#    0| [GoFile] library-tests/semmle/go/PrintAst/other.go
+#    0| [GoFile] other.go
 #    1|   package: [Ident] main
 #    3|   1: [FuncDecl] function declaration
 #    3|     0: [FunctionName, Ident] main

go/ql/test/library-tests/semmle/go/PrintAst/PrintAstRestrictFunction.expected

@@ -1,9 +1,9 @@
 go.mod:
-#    0| [GoModFile] library-tests/semmle/go/PrintAst/go.mod
+#    0| [GoModFile] go.mod
 #    1|   0: [GoModModuleLine] go.mod module line
 #    3|   1: [GoModGoLine] go.mod go line
 input.go:
-#    0| [GoFile] library-tests/semmle/go/PrintAst/input.go
+#    0| [GoFile] input.go
 #    1|   package: [Ident] main
 #    5|   1: [CommentGroup] comment group
 #    5|     0: [SlashSlashComment] comment
@@ -29,7 +29,7 @@ input.go:
 #    3|     0: [ImportSpec] import specifier
 #    3|       0: [StringLit] "fmt"
 other.go:
-#    0| [GoFile] library-tests/semmle/go/PrintAst/other.go
+#    0| [GoFile] other.go
 #    1|   package: [Ident] main
 #    6|   1: [FuncDecl] function declaration
 #    6|     0: [FunctionName, Ident] g

go/ql/test/query-tests/Diagnostics/ExtractionErrors.expected

@@ -1,5 +1,5 @@
-| Extraction failed in query-tests/Diagnostics/badimport.go with error invalid import path (invalid character U+007B '{') | 2 |
-| Extraction failed in query-tests/Diagnostics/type.go with error cannot use v (variable of type V) as T value in argument to takesT | 2 |
+| Extraction failed in badimport.go with error invalid import path (invalid character U+007B '{') | 2 |
+| Extraction failed in type.go with error cannot use v (variable of type V) as T value in argument to takesT | 2 |
 | Extraction failed with error expected ';', found wnvwun | 2 |
 | Extraction failed with error expected 'IDENT', found newline | 2 |
 | Extraction failed with error expected 'package', found avvu | 2 |

go/ql/test/query-tests/Diagnostics/SuccessfullyExtractedFiles.expected

@@ -1,4 +1,3 @@
-| ../../go.mod:0:0:0:0 | ../../go.mod |  |
 | badimport.go:0:0:0:0 | badimport.go |  |
 | type.go:0:0:0:0 | type.go |  |
 | util.go:0:0:0:0 | util.go |  |