Revert runner changes, run unit tests without -race

Author: crobert-1

.github/workflows/darwin-test.yml

@@ -31,8 +31,8 @@ jobs:
     runs-on: ${{ matrix.OS }}
     strategy:
       matrix:
-        # TODO: Add support for ARM runners: https://github.com/actions/runner-images?tab=readme-ov-file#available-images
-        OS: [ "macos-13", "macos-14-large" ]
+        # The "macos-13-xlarge" runner is arm64: https://github.com/actions/runner-images/issues/8439
+        OS: [ "macos-13", "macos-13-xlarge", "macos-14", "macos-15" ]
     steps:
       - name: Check out the codebase.
         uses: actions/checkout@v4
@@ -51,7 +51,7 @@ jobs:
           make install-tools
           mkdir -p unit-test-results/junit
           trap "go-junit-report  -set-exit-code < unit-test-results/go-unit-tests.out > unit-test-results/junit/results.xml" EXIT
-          make for-all CMD="make test" | tee unit-test-results/go-unit-tests.out
+          make for-all CMD="make test-without-race" | tee unit-test-results/go-unit-tests.out
 
       - name: Uploading artifacts
         uses: actions/upload-artifact@v4

Makefile.Common

@@ -29,6 +29,7 @@ COVER_PKGS := $(shell go list ./... | tr "\n" ",")
 # build tags required by any component should be defined as an independent variables and later added to GO_BUILD_TAGS below
 GO_BUILD_TAGS=""
 GOTEST_OPT?= -race -v -timeout 180s --tags=$(GO_BUILD_TAGS)
+GOTEST_OPT_WITHOUT_RACE?= -v -timeout 180s --tags=$(GO_BUILD_TAGS)
 GOCMD?= go
 GOTEST=$(GOCMD) test
 GOOS=$(shell $(GOCMD) env GOOS)
@@ -82,6 +83,13 @@ test-with-codecov:
 	mkdir -p $(PWD)/coverage/unit
 	$(GOTEST) $(GOTEST_OPT) ./... -cover -covermode=atomic -coverpkg $(COVER_PKGS) -args -test.gocoverdir="$(PWD)/coverage/unit"
 
+# Currently, running CGO_ENABLED=0 go test -race is broken in gopsutil/v4
+# This target should be removed in favor of "test" once the following issue is resolved:
+# https://github.com/shirou/gopsutil/issues/1774
+.PHONY: test-without-race
+test-without-race:
+	$(GOTEST) $(GOTEST_OPT_WITHOUT_RACE) $(ALL_PKG_DIRS)
+
 .PHONY: addlicense
 addlicense:
 	@ADDLICENCESEOUT=`$(ADDLICENCESE) -y "" -c 'Splunk, Inc.' $(ALL_SRC) 2>&1`; \