Merge pull request plctlab#21 from melonedo/pr21

Enable check_xxx_tool tests
melonedo · Aug 7, 2022 · 8bbaf19 · 8bbaf19
2 parents 986ac1c + 2db9085
commit 8bbaf19
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/gotools/CMakeLists.txt b/gotools/CMakeLists.txt
@@ -168,12 +168,13 @@ add_custom_target(
        "${cmd_srcroot}/go/internal:src/cmd/go"
        "${cmd_srcroot}/internal:src/cmd"
        "${cmd_srcroot}/go/testdata:src/cmd/go"
-       "${libgo_srcroot}/go/golang.org/x/mod:src/cmd/vendor/golang.org/x"
-       "${libgo_srcroot}/go/golang.org/x/crypto:src/cmd/vendor/golang.org/x"
-       "${libgo_srcroot}/go/golang.org/x/xerrors:src/cmd/vendor/golang.org/x"
+       "${libgo_srcroot}/go/golang.org/x:src/cmd/vendor/golang.org"
     "COPYFILES"
        "${libgo_binroot}/zdefaultcc.go:src/cmd/go/internal/cfg/"
        "${libgo_binroot}/objabi.go:src/cmd/internal/objabi"
+       "${cmd_srcroot}/go.mod:src/cmd"
+       "${cmd_srcroot}/go.sum:src/cmd"
+       "${cmd_srcroot}/vendor/modules.txt:src/cmd/vendor"
     "TIMEOUT" ${cmdgo_check_timeout}
     "GOC" "${rungoc}"
     "BINDIR" ${gotools_binroot}
@@ -197,7 +198,11 @@ add_custom_target(
         "${cmd_srcroot}/vet:src/cmd"
         "${cmd_srcroot}/internal/objabi:src/cmd/internal"
         "${libgo_srcroot}/go/golang.org/x/tools:src/cmd/vendor/golang.org/x"
-    "COPYFILES" "${libgo_binroot}/objabi.go:src/cmd/internal/objabi"
+    "COPYFILES"
+        "${libgo_binroot}/objabi.go:src/cmd/internal/objabi"
+        "${cmd_srcroot}/go.mod:src/cmd"
+        "${cmd_srcroot}/go.sum:src/cmd"
+        "${cmd_srcroot}/vendor/modules.txt:src/cmd/vendor"
     "TIMEOUT" ${default_check_timeout}
     "GOC" "${rungoc}"
     "BINDIR" ${gotools_binroot}
@@ -216,6 +221,7 @@ add_custom_target(
     "SUBDIR" "misc/cgo/test"
     "LOGFILE" "${gotools_binroot}/cmd_cgo-testlog"
     "COPYDIRS" "${libgo_srcroot}/misc/cgo/test:misc/cgo"
+    "COPYFILES" "${libgo_srcroot}/misc/go.mod:misc/cgo"
     "TIMEOUT" ${default_check_timeout}
     "GOC" "${rungoc}"
     "SETENV" "GOTRACEBACK=2"
@@ -235,6 +241,7 @@ add_custom_target(
     "SUBDIR" "misc/cgo/testcarchive"
     "LOGFILE" "${gotools_binroot}/cmd_carchive-testlog"
     "COPYDIRS" "${libgo_srcroot}/misc/cgo/testcarchive:misc/cgo"
+    "COPYFILES" "${libgo_srcroot}/misc/go.mod:misc/cgo"
     "TIMEOUT" ${default_check_timeout}
     "GOC" "${rungoc}"
     "CC" "${runcc}"