[ci skip] Merge branch 'master' into iosbuild

ooni · Oct 12, 2023 · d3423c7 · d3423c7
2 parents c3308c2 + 347e3cd
commit d3423c7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/internal/cmd/buildtool/android_test.go b/internal/cmd/buildtool/android_test.go
@@ -1701,6 +1701,7 @@ func TestAndroidBuildCdepsTor(t *testing.T) {
 				"--disable-tool-name-check",
 				"--disable-systemd",
 				"--prefix=/",
+				"--disable-unittests",
 			},
 		}, {
 			Env: []string{},
@@ -1777,6 +1778,7 @@ func TestAndroidBuildCdepsTor(t *testing.T) {
 				"--disable-tool-name-check",
 				"--disable-systemd",
 				"--prefix=/",
+				"--disable-unittests",
 			},
 		}, {
 			Env: []string{},
@@ -1853,6 +1855,7 @@ func TestAndroidBuildCdepsTor(t *testing.T) {
 				"--disable-tool-name-check",
 				"--disable-systemd",
 				"--prefix=/",
+				"--disable-unittests",
 			},
 		}, {
 			Env: []string{},
@@ -1929,6 +1932,7 @@ func TestAndroidBuildCdepsTor(t *testing.T) {
 				"--disable-tool-name-check",
 				"--disable-systemd",
 				"--prefix=/",
+				"--disable-unittests",
 			},
 		}, {
 			Env: []string{},

diff --git a/internal/cmd/buildtool/linuxcdeps_test.go b/internal/cmd/buildtool/linuxcdeps_test.go
@@ -346,6 +346,7 @@ func TestLinuxCdepsBuildMain(t *testing.T) {
 				"--disable-tool-name-check",
 				"--disable-systemd",
 				"--prefix=/",
+				"--disable-unittests",
 			},
 		}, {
 			Env: []string{},