fix(test): resolve macOS binary selection and test data clobbering (#9606)

**Description**

This PR builds upon
[#9603](#9603) by @shiva-istari
and adds fixes for issues exposed when macOS skip guards are removed.

### Original PR (#9603)

> On macOS, setupBinary() now copies both the Linux binary (for Docker
containers) and the host-native binary (for local bulk/live loader
commands) into tempBinDir. On Linux, a single binary serves both
purposes. BulkLoad() and LiveLoad() use hostDgraphBinaryPath() to pick
the correct one based on the platform. Removed macOS skip guards from 13
test files so all tests run on both platforms after make install.

### Fix 1: test data clobbering in `--suite=all` (`t/t.go`)

When running `make test` (`--suite=all`), the `load` and `ldbc` download
blocks shared `*tmp`. The LDBC block's `MakeDirEmpty` wiped load data
files, causing `systest/1million` to fail. Fixed by hoisting directory
init above both download blocks so `MakeDirEmpty` runs once. Also uses a
dedicated subdirectory (`dgraph-test-data`) instead of bare
`os.TempDir()`.

### Fix 2: `$GOPATH/bin` in Docker Compose files (30 files)

30 Docker Compose files hardcoded `$GOPATH/bin` as the binary mount
source. On macOS this mounts the native binary into Linux containers,
crashing them. Replaced all 78 occurrences with
`${LINUX_GOBIN:-$GOPATH/bin}` to match the pattern in
`dgraph/docker-compose.yml`.

### Fix 3: add `--timeout` flag to t/ runner

The per-package test timeout was hardcoded to 30m, which is too short
for the `21million/live` test on macOS (where Docker runs in a VM with
I/O overhead). Added a `--timeout` flag to `t/t.go` and wired it through
the Makefile as `TIMEOUT`:

```bash
make test TIMEOUT=90m
cd t && ./t --suite=all --timeout=60m
```

Defaults remain unchanged: 30m normal, 180m with `--race`. An explicit
`--timeout` overrides both. Updated docs in Makefile help,
CONTRIBUTING.md, and TESTING.md.

**Checklist**

- [x] The PR title follows the [Conventional
Commits](https://www.conventionalcommits.org/en/v1.0.0/#summary) syntax
- [x] Code compiles correctly and linting passes locally

---------

Co-authored-by: Shiva <[email protected]>

Author: mlwelles

CONTRIBUTING.md

@@ -154,6 +154,7 @@ make test-upgrade       # Upgrade tests
 
 # Use variables for more control
 make test TAGS=integration2 PKG=systest/vector
+make test TIMEOUT=90m          # Override per-package timeout (default: 30m)
 ```
 
 Run `make help` to see all available targets and variables.

Makefile

@@ -98,7 +98,7 @@ else
 endif
 else
 	@echo "Running test suite: $(or $(SUITE),all)"
-	$(MAKE) -C t test args="--suite=$(or $(SUITE),all) $(if $(PKG),--pkg=\"$(PKG)\") $(if $(TEST),--test=\"$(TEST)\")"
+	$(MAKE) -C t test args="--suite=$(or $(SUITE),all) $(if $(PKG),--pkg=\"$(PKG)\") $(if $(TEST),--test=\"$(TEST)\") $(if $(TIMEOUT),--timeout=$(TIMEOUT))"
 endif
 
 .PHONY: test-all
@@ -205,6 +205,7 @@ help: ## Show available targets and variables
 	@echo "  TAGS      Go build tags - bypasses t/ runner (e.g., make test TAGS=integration2)"
 	@echo "  PKG       Limit to specific package (e.g., make test PKG=systest/export)"
 	@echo "  TEST      Run specific test function (e.g., make test TEST=TestGQLSchema)"
+	@echo "  TIMEOUT   Per-package test timeout (e.g., make test TIMEOUT=60m). Default: 30m"
 	@echo "  FUZZ      Enable fuzz testing (e.g., make test FUZZ=1)"
 	@echo "  FUZZTIME  Fuzz duration per package (e.g., make test FUZZ=1 FUZZTIME=60s)"
 	@echo ""
@@ -223,4 +224,5 @@ help: ## Show available targets and variables
 	@echo "  make test TAGS=upgrade PKG=acl TEST=TestACL           # specific upgrade test"
 	@echo "  make test FUZZ=1 PKG=dql FUZZTIME=30s                 # fuzz dql package for 30s"
 	@echo "  make test SUITE=systest PKG=systest/backup/filesystem # systest for backup pkg"
+	@echo "  make test TIMEOUT=90m                                  # all suites with 90m timeout"
 	@echo "  make test-benchmark PKG=posting                       # benchmark posting package"

TESTING.md

@@ -335,6 +335,7 @@ For more control, pass variables to `make test`:
 | `TAGS`     | Go build tags - bypasses t/ runner | `make test TAGS=integration2`   |
 | `PKG`      | Limit to specific package          | `make test PKG=systest/export`  |
 | `TEST`     | Run specific test function         | `make test TEST=TestGQLSchema`  |
+| `TIMEOUT`  | Per-package test timeout           | `make test TIMEOUT=90m`         |
 | `FUZZ`     | Enable fuzz testing                | `make test FUZZ=1`              |
 | `FUZZTIME` | Fuzz duration per package          | `make test FUZZ=1 FUZZTIME=60s` |
 
@@ -578,15 +579,16 @@ cd t && go build .
 
 ### Key Flags
 
-| Flag          | Description                                                        |
-| ------------- | ------------------------------------------------------------------ |
-| `--suite=X`   | Select test suite(s): all, ldbc, load, unit, systest, vector, core |
-| `--pkg=X`     | Run specific package                                               |
-| `--test=X`    | Run specific test function                                         |
-| `-j=N`        | Concurrency (default: 1)                                           |
-| `--keep`      | Keep cluster running after tests                                   |
-| `-r`          | Remove all test containers                                         |
-| `--skip-slow` | Skip slow packages                                                 |
+| Flag          | Description                                                         |
+| ------------- | ------------------------------------------------------------------- |
+| `--suite=X`   | Select test suite(s): all, ldbc, load, unit, systest, vector, core  |
+| `--pkg=X`     | Run specific package                                                |
+| `--test=X`    | Run specific test function                                          |
+| `--timeout=X` | Per-package timeout (e.g. 60m, 2h). Default: 30m (180m with --race) |
+| `-j=N`        | Concurrency (default: 1)                                            |
+| `--keep`      | Keep cluster running after tests                                    |
+| `-r`          | Remove all test containers                                          |
+| `--skip-slow` | Skip slow packages                                                  |
 
 ---
 

check_upgrade/check_upgrade_test.go

@@ -10,11 +10,8 @@ package checkupgrade
 import (
 	"context"
 	"fmt"
-	"os"
 	"os/exec"
-	"path/filepath"
 	"regexp"
-	"runtime"
 	"testing"
 	"time"
 
@@ -28,11 +25,6 @@ import (
 )
 
 func TestCheckUpgrade(t *testing.T) {
-	if runtime.GOOS != "linux" && os.Getenv("DGRAPH_BINARY") == "" {
-		fmt.Println("Skipping live load-uids tests on non-Linux platforms due to dgraph binary dependency")
-		fmt.Println("You can set the DGRAPH_BINARY environment variable to path of a native dgraph binary to run these tests")
-		os.Exit(0)
-	}
 	conf := dgraphtest.NewClusterConfig().WithNumAlphas(1).WithNumZeros(1).WithReplicas(1).
 		WithACL(time.Hour).WithVersion("57aa5c4ac")
 	c, err := dgraphtest.NewLocalCluster(conf)
@@ -88,7 +80,7 @@ func TestCheckUpgrade(t *testing.T) {
 		"--namespace", "1",
 	}
 
-	cmd := exec.Command(filepath.Join(c1.GetTempDir(), "dgraph"), args...)
+	cmd := exec.Command(c1.HostDgraphBinaryPath(), args...)
 	out, err := cmd.CombinedOutput()
 	require.NoError(t, err)
 	actualOutput := string(out)
@@ -108,7 +100,7 @@ func TestQueryDuplicateNodes(t *testing.T) {
 		WithACL(time.Hour).WithVersion("57aa5c4ac").WithAclAlg(jwt.GetSigningMethod("HS256"))
 	c, err := dgraphtest.NewLocalCluster(conf)
 	require.NoError(t, err)
-	// defer func() { c.Cleanup(t.Failed()) }()
+	defer func() { c.Cleanup(t.Failed()) }()
 	require.NoError(t, c.Start())
 	gc, cleanup, err := c.Client()
 	require.NoError(t, err)

dgraph/cmd/alpha/mutations_mode/docker-compose.yml

@@ -13,7 +13,7 @@ services:
       - "9080"
     volumes:
       - type: bind
-        source: $GOPATH/bin
+        source: ${LINUX_GOBIN:-$GOPATH/bin}
         target: /gobin
         read_only: true
     command:
@@ -30,7 +30,7 @@ services:
       - "9080"
     volumes:
       - type: bind
-        source: $GOPATH/bin
+        source: ${LINUX_GOBIN:-$GOPATH/bin}
         target: /gobin
         read_only: true
     command:
@@ -47,7 +47,7 @@ services:
       - "9080"
     volumes:
       - type: bind
-        source: $GOPATH/bin
+        source: ${LINUX_GOBIN:-$GOPATH/bin}
         target: /gobin
         read_only: true
     command:
@@ -64,7 +64,7 @@ services:
       - "6080"
     volumes:
       - type: bind
-        source: $GOPATH/bin
+        source: ${LINUX_GOBIN:-$GOPATH/bin}
         target: /gobin
         read_only: true
     command:
@@ -82,7 +82,7 @@ services:
       - "6080"
     volumes:
       - type: bind
-        source: $GOPATH/bin
+        source: ${LINUX_GOBIN:-$GOPATH/bin}
         target: /gobin
         read_only: true
     command:
@@ -100,7 +100,7 @@ services:
       - "6080"
     volumes:
       - type: bind
-        source: $GOPATH/bin
+        source: ${LINUX_GOBIN:-$GOPATH/bin}
         target: /gobin
         read_only: true
     command:

dgraph/cmd/dgraphimport/import_test.go

@@ -10,9 +10,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"os"
 	"path/filepath"
-	"runtime"
 	"strconv"
 	"strings"
 	"testing"
@@ -326,11 +324,6 @@ func runImportTest(t *testing.T, tt testcase) {
 
 // setupBulkCluster creates and configures a cluster for bulk loading data
 func setupBulkCluster(t *testing.T, numAlphas int, encrypted bool) (*dgraphtest.LocalCluster, string) {
-	if runtime.GOOS != "linux" && os.Getenv("DGRAPH_BINARY") == "" {
-		fmt.Println("You can set the DGRAPH_BINARY environment variable to path of a native dgraph binary to run these tests")
-		t.Skip("Skipping test on non-Linux platforms due to dgraph binary dependency")
-	}
-
 	baseDir := t.TempDir()
 	bulkConf := dgraphtest.NewClusterConfig().
 		WithNumAlphas(numAlphas).

dgraph/cmd/live/load-json/load_test.go

@@ -9,7 +9,6 @@ package live
 
 import (
 	"context"
-	"fmt"
 	"os"
 	"path/filepath"
 	"runtime"
@@ -162,12 +161,6 @@ func TestLiveLoadJSONMultipleFiles(t *testing.T) {
 }
 
 func TestMain(m *testing.M) {
-	if runtime.GOOS != "linux" && os.Getenv("DGRAPH_BINARY") == "" {
-		fmt.Println("Skipping live load-json tests on non-Linux platforms due to dgraph binary dependency")
-		fmt.Println("You can set the DGRAPH_BINARY environment variable to path of a native dgraph binary to run these tests")
-		os.Exit(0)
-	}
-
 	_, thisFile, _, _ := runtime.Caller(0)
 	testDataDir = filepath.Dir(thisFile)
 

dgraph/cmd/live/load-uids/load_test.go

@@ -351,12 +351,6 @@ func TestLiveLoadFileNameMultipleCorrect(t *testing.T) {
 }
 
 func TestMain(m *testing.M) {
-	if runtime.GOOS != "linux" && os.Getenv("DGRAPH_BINARY") == "" {
-		fmt.Println("Skipping live load-uids tests on non-Linux platforms due to dgraph binary dependency")
-		fmt.Println("You can set the DGRAPH_BINARY environment variable to path of a native dgraph binary to run these tests")
-		os.Exit(0)
-	}
-
 	alphaService = testutil.GetSockAddr()
 	alphaName = testutil.Instance
 

dgraph/cmd/version/version_test.go

@@ -6,10 +6,8 @@
 package version
 
 import (
-	"fmt"
 	"os"
 	"path/filepath"
-	"runtime"
 	"testing"
 
 	"github.com/stretchr/testify/require"
@@ -19,11 +17,6 @@ import (
 
 // Test `dgraph version` with an empty config file.
 func TestMain(m *testing.M) {
-	if runtime.GOOS != "linux" && os.Getenv("DGRAPH_BINARY") == "" {
-		fmt.Println("Skipping version tests on non-Linux platforms due to dgraph binary dependency")
-		fmt.Println("You can set the DGRAPH_BINARY environment variable to path of a native dgraph binary to run these tests")
-		os.Exit(0)
-	}
 	m.Run()
 }
 

dgraphtest/image.go

@@ -12,6 +12,7 @@ import (
 	"os"
 	"os/exec"
 	"path/filepath"
+	"runtime"
 	"strings"
 	"sync"
 
@@ -28,9 +29,18 @@ func (c *LocalCluster) dgraphImage() string {
 	return "dgraph/dgraph:local"
 }
 
-// setupBinary sets up the dgraph binary. The binary is expected to be a version
-// compiled that is compatible with the host OS and architecture. Search this repo
-// for DGRAPH_BINARY to learn its use.
+// setupBinary sets up dgraph binaries in tempBinDir.
+//
+// On Linux a single "dgraph" binary from $GOPATH/bin serves both Docker
+// containers and local commands (bulk/live loader).
+//
+// On non-Linux (macOS) two binaries are placed in tempBinDir:
+//   - "dgraph"      – a Linux binary for Docker containers, from
+//     $GOPATH/linux_<arch> (or LINUX_GOBIN if set).
+//   - "dgraph_host" – the host-native binary for local commands,
+//     from $GOPATH/bin.
+//
+// Both are produced by "make install".
 func (c *LocalCluster) setupBinary() error {
 	if err := ensureDgraphClone(); err != nil {
 		panic(err)
@@ -43,11 +53,34 @@ func (c *LocalCluster) setupBinary() error {
 		}
 	}
 	if c.conf.version == localVersion {
-		if os.Getenv("GOPATH") == "" {
+		gopath := os.Getenv("GOPATH")
+		if gopath == "" {
 			return errors.New("GOPATH is not set")
 		}
-		fromDir := filepath.Join(os.Getenv("GOPATH"), "bin")
-		return copyBinary(fromDir, c.tempBinDir, c.conf.version)
+
+		if runtime.GOOS == "linux" {
+			// On Linux $GOPATH/bin/dgraph is both the native and Docker binary.
+			return copyBinary(filepath.Join(gopath, "bin"), c.tempBinDir, c.conf.version)
+		}
+
+		// Non-Linux (macOS): need separate Linux and host-native binaries.
+		// 1. Copy the Linux binary (for Docker containers) as "dgraph".
+		linuxDir := os.Getenv("LINUX_GOBIN")
+		if linuxDir == "" {
+			linuxDir = filepath.Join(gopath, "linux_"+runtime.GOARCH)
+		}
+		if err := copyBinary(linuxDir, c.tempBinDir, c.conf.version); err != nil {
+			return err
+		}
+
+		// 2. Copy the host-native binary (for local bulk/live commands) as "dgraph_host".
+		hostSrc := filepath.Join(gopath, "bin", "dgraph")
+
+		hostDst := filepath.Join(c.tempBinDir, "dgraph_host")
+		if err := copy(hostSrc, hostDst); err != nil {
+			return errors.Wrapf(err, "error copying host-native binary from [%v] to [%v]", hostSrc, hostDst)
+		}
+		return nil
 	}
 
 	binaryPath := filepath.Join(binariesPath, fmt.Sprintf(binaryNameFmt, c.conf.version))