Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cleanup(buildtool): disable unit tests when building tor #1368

Merged
merged 10 commits into from
Oct 12, 2023
Merged

cleanup(buildtool): disable unit tests when building tor #1368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
12a61a2
x
bassosimone Oct 10, 2023
189be65
x
bassosimone Oct 10, 2023
313c4c9
Merge remote-tracking branch 'origin/master' into iosbuild
bassosimone Oct 12, 2023
9513b30
feat: attempt to build tor for iOS
bassosimone Oct 12, 2023
fd9dbca
fix ci build (well, hopefully)
bassosimone Oct 12, 2023
1b55ff3
fix ci build (well, hopefully)
bassosimone Oct 12, 2023
4f1bf9a
fix ci build (well, hopefully)
bassosimone Oct 12, 2023
c3308c2
Merge branch 'master' into iosbuild
bassosimone Oct 12, 2023
e69ae11
x
bassosimone Oct 12, 2023
f3a2a82
x
bassosimone Oct 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions internal/cmd/buildtool/android_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1701,6 +1701,7 @@ func TestAndroidBuildCdepsTor(t *testing.T) {
"--disable-tool-name-check",
"--disable-systemd",
"--prefix=/",
"--disable-unittests",
},
}, {
Env: []string{},
Expand Down Expand Up @@ -1777,6 +1778,7 @@ func TestAndroidBuildCdepsTor(t *testing.T) {
"--disable-tool-name-check",
"--disable-systemd",
"--prefix=/",
"--disable-unittests",
},
}, {
Env: []string{},
Expand Down Expand Up @@ -1853,6 +1855,7 @@ func TestAndroidBuildCdepsTor(t *testing.T) {
"--disable-tool-name-check",
"--disable-systemd",
"--prefix=/",
"--disable-unittests",
},
}, {
Env: []string{},
Expand Down Expand Up @@ -1929,6 +1932,7 @@ func TestAndroidBuildCdepsTor(t *testing.T) {
"--disable-tool-name-check",
"--disable-systemd",
"--prefix=/",
"--disable-unittests",
},
}, {
Env: []string{},
Expand Down
1 change: 1 addition & 0 deletions internal/cmd/buildtool/cdepstor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))

Expand Down
1 change: 1 addition & 0 deletions internal/cmd/buildtool/linuxcdeps_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,6 +346,7 @@ func TestLinuxCdepsBuildMain(t *testing.T) {
"--disable-tool-name-check",
"--disable-systemd",
"--prefix=/",
"--disable-unittests",
},
}, {
Env: []string{},
Expand Down