diff options
| author | Jakob Borg <jakob@kastelo.net> | 2023-06-05 10:19:47 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-05 10:19:47 +0200 |
| commit | ae176ea9cd7058cce5a2d6e36ec89e90d1ce8170 (patch) | |
| tree | 1b130a10f1ca76db8581eff0a0ddc6306cf0414f | |
| parent | 2b17db8aa3023ca966fec02d5052201b382a2be0 (diff) | |
| download | syncthing-ae176ea9cd7058cce5a2d6e36ec89e90d1ce8170.tar.gz syncthing-ae176ea9cd7058cce5a2d6e36ec89e90d1ce8170.zip | |
build: Tests should run with Go 1.20 on Windows (#8924)
Tests should run with Go 1.20 on Windows
| -rw-r--r-- | .github/workflows/build-syncthing.yaml | 4 | ||||
| -rw-r--r-- | lib/fs/basicfs_windows_test.go | 9 |
2 files changed, 0 insertions, 13 deletions
diff --git a/.github/workflows/build-syncthing.yaml b/.github/workflows/build-syncthing.yaml index cce4ce9ab..cad049824 100644 --- a/.github/workflows/build-syncthing.yaml +++ b/.github/workflows/build-syncthing.yaml @@ -67,10 +67,6 @@ jobs: go run build.go - name: Test - # Our Windows tests currently don't work on Go 1.20 - # https://github.com/syncthing/syncthing/issues/8779 - # https://github.com/syncthing/syncthing/issues/8778 - if: "!(matrix.go == '1.20' && matrix.runner == 'windows-latest')" run: | go run build.go test diff --git a/lib/fs/basicfs_windows_test.go b/lib/fs/basicfs_windows_test.go index d3ead2421..22519335f 100644 --- a/lib/fs/basicfs_windows_test.go +++ b/lib/fs/basicfs_windows_test.go @@ -12,7 +12,6 @@ package fs import ( "os" "path/filepath" - "runtime" "strings" "syscall" "testing" @@ -37,14 +36,6 @@ func TestWindowsPaths(t *testing.T) { {`\\192.0.2.22\network\share`, `\\192.0.2.22\network\share`, `\\192.0.2.22\network\share`}, } - if runtime.Version() >= "go1.20" { - testCases = append(testCases, - testCase{`\\.\e:`, `\\.\e:\`, `e:\`}, - testCase{`\\.\e:\`, `\\.\e:\`, `e:\`}, - testCase{`\\.\e:\\`, `\\.\e:\`, `e:\`}, - ) - } - for i, testCase := range testCases { fs := newBasicFilesystem(testCase.input) if fs.root != testCase.expectedRoot { |