all: Add build constants for runtime.GOOS comparisons (#8442)

all: Add package runtimeos for runtime.GOOS comparisons

I grew tired of hand written string comparisons. This adds generated
constants for the GOOS values, and predefined Is$OS constants that can
be iffed on. In a couple of places I rewrote trivial switch:es to if:s,
and added Illumos where we checked for Solaris (because they are
effectively the same, and if we're going to target one of them that
would be Illumos...).
This commit is contained in:
Jakob Borg
2022-07-28 19:36:39 +02:00
committed by GitHub
parent f13d65262a
commit a3c724f2c3
51 changed files with 282 additions and 192 deletions
+6 -6
View File
@@ -15,12 +15,12 @@ import (
"io"
"os"
"path/filepath"
"runtime"
"strconv"
"strings"
"testing"
"time"
"github.com/syncthing/syncthing/lib/build"
"github.com/syncthing/syncthing/lib/events"
"github.com/syncthing/syncthing/lib/fs"
"github.com/syncthing/syncthing/lib/ignore"
@@ -205,7 +205,7 @@ func TestHandleFileWithTemp(t *testing.T) {
func TestCopierFinder(t *testing.T) {
methods := []fs.CopyRangeMethod{fs.CopyRangeMethodStandard, fs.CopyRangeMethodAllWithFallback}
if runtime.GOOS == "linux" {
if build.IsLinux {
methods = append(methods, fs.CopyRangeMethodSendFile)
}
for _, method := range methods {
@@ -789,7 +789,7 @@ func TestCopyOwner(t *testing.T) {
// Verifies that owner and group are copied from the parent, for both
// files and directories.
if runtime.GOOS == "windows" {
if build.IsWindows {
t.Skip("copying owner not supported on Windows")
}
@@ -986,7 +986,7 @@ func TestDeleteBehindSymlink(t *testing.T) {
must(t, ffs.RemoveAll(link))
if err := fs.DebugSymlinkForTestsOnly(destFs, ffs, "", link); err != nil {
if runtime.GOOS == "windows" {
if build.IsWindows {
// Probably we require permissions we don't have.
t.Skip("Need admin permissions or developer mode to run symlink test on Windows: " + err.Error())
} else {
@@ -1145,7 +1145,7 @@ func TestPullCaseOnlyDir(t *testing.T) {
}
func TestPullCaseOnlySymlink(t *testing.T) {
if runtime.GOOS == "windows" {
if build.IsWindows {
t.Skip("symlinks not supported on windows")
}
testPullCaseOnlyDirOrSymlink(t, false)
@@ -1275,7 +1275,7 @@ func TestPullCaseOnlyRename(t *testing.T) {
}
func TestPullSymlinkOverExistingWindows(t *testing.T) {
if runtime.GOOS != "windows" {
if !build.IsWindows {
t.Skip()
}