Add integration tests

nekohasekai · nekohasekai · commit 8d192efc14cb · 2025-12-14T20:03:30.000+08:00
diff --git a/.github/workflows/naive-build.yml b/.github/workflows/naive-build.yml
@@ -62,7 +62,9 @@ jobs:
         if: steps.build-cache.outputs.cache-hit != 'true'
         run: ccache -s
       - name: Package
-        run: go run ./cmd/build-naive --target=linux/${{ matrix.arch }} package --local
+        run: |
+          go run ./cmd/build-naive --target=linux/${{ matrix.arch }} package --local
+          go run ./cmd/build-naive --target=linux/${{ matrix.arch }} package
       - name: Cache toolchain
         uses: actions/cache@v4
         with:
@@ -174,7 +176,9 @@ jobs:
         if: steps.build-cache.outputs.cache-hit != 'true'
         run: ccache -s
       - name: Package
-        run: go run ./cmd/build-naive --target=${{ matrix.target }} package --local
+        run: |
+          go run ./cmd/build-naive --target=${{ matrix.target }} package --local
+          go run ./cmd/build-naive --target=${{ matrix.target }} package
       - name: Build and run test binary
         if: matrix.target == 'darwin/arm64'
         run: |
@@ -313,7 +317,9 @@ jobs:
         if: steps.build-cache.outputs.cache-hit != 'true'
         run: ccache -s
       - name: Package
-        run: go run ./cmd/build-naive --target=android/${{ matrix.arch }} package --local
+        run: |
+          go run ./cmd/build-naive --target=android/${{ matrix.arch }} package --local
+          go run ./cmd/build-naive --target=android/${{ matrix.arch }} package
       - name: Setup Android NDK
         uses: nttld/setup-ndk@v1
         id: setup-ndk
@@ -379,7 +385,9 @@ jobs:
         if: steps.build-cache.outputs.cache-hit != 'true'
         run: ccache -s
       - name: Package
-        run: go run ./cmd/build-naive --target=linux/${{ matrix.arch }} --libc=musl package --local
+        run: |
+          go run ./cmd/build-naive --target=linux/${{ matrix.arch }} --libc=musl package --local
+          go run ./cmd/build-naive --target=linux/${{ matrix.arch }} --libc=musl package
       - name: Cache toolchain
         uses: actions/cache@v4
         with:
@@ -417,6 +425,139 @@ jobs:
             include/
             include_cgo.go
 
+  integration-test:
+    if: github.event_name == 'push'
+    needs: [linux, darwin, windows]
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - name: linux-amd64-cgo
+            os: ubuntu-22.04
+            artifact: cronet-linux-amd64
+            target: linux/amd64
+            mode: cgo
+          - name: linux-amd64-purego
+            os: ubuntu-22.04
+            artifact: cronet-linux-amd64
+            target: linux/amd64
+            mode: purego
+          - name: darwin-arm64
+            os: macos-15
+            artifact: cronet-darwin-arm64
+            target: darwin/arm64
+            mode: cgo
+          - name: windows-amd64
+            os: windows-2022
+            artifact: cronet-windows-amd64
+            target: windows/amd64
+            mode: purego
+    runs-on: ${{ matrix.os }}
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: 'recursive'
+
+      - uses: actions/setup-go@v5
+        with:
+          go-version: ^1.24
+
+      - name: Download artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: ${{ matrix.artifact }}
+          path: .
+
+      - name: Get naiveproxy commit
+        id: naive
+        shell: bash
+        run: echo "commit=$(git -C naiveproxy rev-parse HEAD)" >> $GITHUB_OUTPUT
+
+      - name: Get Chromium version
+        id: chromium
+        shell: bash
+        run: echo "version=$(cat naiveproxy/CHROMIUM_VERSION)" >> $GITHUB_OUTPUT
+
+      # Linux: restore build cache and toolchain cache (needed for env command)
+      - name: Restore build cache (Linux)
+        if: runner.os == 'Linux'
+        uses: actions/cache/restore@v4
+        with:
+          path: naiveproxy/src/out
+          key: naive-build-${{ steps.naive.outputs.commit }}-${{ hashFiles('cmd/build-naive/cmd_build.go', 'cmd/build-naive/cmd.go') }}-linux-amd64
+
+      - name: Restore toolchain cache (Linux)
+        if: runner.os == 'Linux'
+        uses: actions/cache/restore@v4
+        with:
+          path: |
+            naiveproxy/src/third_party/llvm-build
+            naiveproxy/src/gn/out
+            naiveproxy/src/chrome/build/pgo_profiles
+          key: toolchain-linux-${{ steps.chromium.outputs.version }}
+
+      - name: Download toolchain (Linux)
+        if: runner.os == 'Linux'
+        run: go run ./cmd/build-naive --target=linux/amd64 download-toolchain
+
+      # Darwin: restore build cache (needed for env command)
+      - name: Restore build cache (macOS)
+        if: runner.os == 'macOS'
+        uses: actions/cache/restore@v4
+        with:
+          path: naiveproxy/src/out
+          key: naive-build-${{ steps.naive.outputs.commit }}-${{ hashFiles('cmd/build-naive/cmd_build.go', 'cmd/build-naive/cmd.go') }}-darwin-arm64
+
+      # Install iperf3
+      - name: Install iperf3 (Linux)
+        if: runner.os == 'Linux'
+        run: |
+          sudo apt update
+          sudo apt install -y iperf3
+
+      - name: Install iperf3 (macOS)
+        if: runner.os == 'macOS'
+        run: brew install iperf3
+
+      - name: Install iperf3 (Windows)
+        if: runner.os == 'Windows'
+        run: choco install iperf3
+
+      # Generate package --local files
+      - name: Package (non-Windows)
+        if: runner.os != 'Windows'
+        run: go run ./cmd/build-naive --target=${{ matrix.target }} package --local
+
+      # CGO mode tests
+      - name: Run integration tests (CGO - Linux)
+        if: matrix.mode == 'cgo' && runner.os == 'Linux'
+        run: |
+          eval $(go run ./cmd/build-naive --target=${{ matrix.target }} env --export)
+          cd test && CGO_ENABLED=1 go test -v
+
+      - name: Run integration tests (CGO - macOS)
+        if: matrix.mode == 'cgo' && runner.os == 'macOS'
+        run: |
+          eval $(go run ./cmd/build-naive --target=${{ matrix.target }} env --export)
+          cd test && CGO_ENABLED=1 go test -v
+
+      # purego mode tests
+      - name: Run integration tests (purego - Linux)
+        if: matrix.mode == 'purego' && runner.os == 'Linux'
+        working-directory: test
+        run: |
+          export LD_LIBRARY_PATH=$PWD/../lib/linux_amd64
+          CGO_ENABLED=0 go test -tags with_purego -v
+
+      - name: Run integration tests (purego - Windows)
+        if: matrix.mode == 'purego' && runner.os == 'Windows'
+        working-directory: test
+        shell: bash
+        run: |
+          # Add DLL directory to PATH for library loading
+          export PATH="$PWD/../lib/windows_amd64:$PATH"
+          go test -tags with_purego -v
+
   publish:
     if: github.event_name == 'push'
     needs: [linux, linux-musl, darwin, windows, android]
diff --git a/cmd/build-naive/cmd_env.go b/cmd/build-naive/cmd_env.go
@@ -74,43 +74,26 @@ func printEnv(t Target) {
 		log.Fatal("env command is not supported for Windows (use purego mode with embedded DLL)")
 	}
 
-	outputDirectory := getOutputDirectory(t)
-	linkFlags, err := extractLinkFlags(outputDirectory)
-	if err != nil {
-		log.Fatalf("failed to extract link flags: %v", err)
-	}
-
-	// Build CGO_LDFLAGS with library path and link flags
-	var ldFlags []string
-	libraryDirectory := filepath.Join(projectRoot, "lib", getLibraryDirectoryName(t))
-
-	if t.GOOS == "darwin" || t.GOOS == "ios" {
-		ldFlags = append(ldFlags, filepath.Join(libraryDirectory, "libcronet.a"))
-	} else {
-		ldFlags = append(ldFlags, "-L"+libraryDirectory, "-l:libcronet.a")
+	prefix := ""
+	if envExport {
+		prefix = "export "
 	}
 
-	ldFlags = append(ldFlags, linkFlags.LDFlags...)
-	ldFlags = append(ldFlags, linkFlags.Libs...)
-	ldFlags = append(ldFlags, linkFlags.Frameworks...)
-
-	// Platform-specific linker flags
+	// CGO_LDFLAGS: Only output flags NOT included in package --local generated files
+	// The package command generates lib_*_cgo.go with #cgo LDFLAGS containing library
+	// paths and system libs. Here we only output additional toolchain flags.
 	if t.GOOS == "linux" {
+		var ldFlags []string
 		ldFlags = append(ldFlags, "-fuse-ld=lld")
 		if t.ARCH == "386" || t.ARCH == "arm" {
 			ldFlags = append(ldFlags, "-no-pie")
 		}
 		if t.Libc == "musl" {
 			ldFlags = append(ldFlags, "-static")
 		}
+		fmt.Printf("%sCGO_LDFLAGS=%s\n", prefix, shellQuote(strings.Join(ldFlags, " ")))
 	}
-
-	prefix := ""
-	if envExport {
-		prefix = "export "
-	}
-
-	fmt.Printf("%sCGO_LDFLAGS=%s\n", prefix, shellQuote(strings.Join(ldFlags, " ")))
+	// Darwin/iOS: No CGO_LDFLAGS needed, all flags are in package --local generated files
 
 	// Linux-specific: CC, CXX for cross-compilation, QEMU_LD_PREFIX for running binaries
 	if t.GOOS == "linux" {
diff --git a/test/.gitignore b/test/.gitignore
@@ -0,0 +1 @@
+/bin/
diff --git a/test/config/sing-box.json b/test/config/sing-box.json
@@ -0,0 +1,20 @@
+{
+  "inbounds": [
+    {
+      "type": "naive",
+      "listen": "::",
+      "listen_port": 10000,
+      "users": [
+        {
+          "username": "test",
+          "password": "test"
+        }
+      ],
+      "tls": {
+        "enabled": true,
+        "certificate_path": "/cert.pem",
+        "key_path": "/key.pem"
+      }
+    }
+  ]
+}
diff --git a/test/go.mod b/test/go.mod
@@ -0,0 +1,23 @@
+module github.com/sagernet/cronet-go/test
+
+go 1.24.0
+
+require (
+	github.com/sagernet/cronet-go v0.0.0
+	github.com/sagernet/sing v0.7.13
+	github.com/stretchr/testify v1.11.1
+	go.uber.org/goleak v1.3.0
+)
+
+require (
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/ebitengine/purego v0.9.1 // indirect
+	github.com/kr/pretty v0.3.1 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/rogpeppe/go-internal v1.14.1 // indirect
+	golang.org/x/sys v0.39.0 // indirect
+	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
+)
+
+replace github.com/sagernet/cronet-go => ../
diff --git a/test/go.sum b/test/go.sum
@@ -0,0 +1,31 @@
+github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/ebitengine/purego v0.9.1 h1:a/k2f2HQU3Pi399RPW1MOaZyhKJL9w/xFpKAg4q1s0A=
+github.com/ebitengine/purego v0.9.1/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ=
+github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
+github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
+github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
+github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
+github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
+github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
+github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
+github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ=
+github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc=
+github.com/sagernet/sing v0.7.13 h1:XNYgd8e3cxMULs/LLJspdn/deHrnPWyrrglNHeCUAYM=
+github.com/sagernet/sing v0.7.13/go.mod h1:ARkL0gM13/Iv5VCZmci/NuoOlePoIsW0m7BWfln/Hak=
+github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
+github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
+go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
+go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
+golang.org/x/sys v0.39.0 h1:CvCKL8MeisomCi6qNZ+wbb0DN9E5AATixKsvNtMoMFk=
+golang.org/x/sys v0.39.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
diff --git a/test/main_test.go b/test/main_test.go
