[backport] cleanup(buildtool): disable unit tests when building tor

This diff backports #1368 to the release/3.19 branch. We're building unit tests for no reason. Also, unit tests do not build for iOS. So, let's stop building them. Part of ooni/probe#2564
ooni · Oct 12, 2023 · cfb3c85 · cfb3c85
1 parent 06cda7b
commit cfb3c85
Show file tree

Hide file tree

Showing 3 changed files with 6 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/cdepstor.go b/internal/cmd/buildtool/cdepstor.go
@@ -56,6 +56,7 @@ func cdepsTorBuildMain(globalEnv *cBuildEnv, deps buildtoolmodel.Dependencies) {
 		"--disable-tool-name-check",
 		"--disable-systemd",
 		"--prefix=/",
+		"--disable-unittests",
 	)
 	runtimex.Try0(shellx.RunEx(defaultShellxConfig(), argv, envp))
 

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{},