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

Jump to bottom

chore(buildtool): add ios-build unit tests #1371

Merged
merged 5 commits into from
Oct 12, 2023
Merged

chore(buildtool): add ios-build unit tests #1371

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9f4ce24
chore(buildtool): add ios-build unit tests
bassosimone Oct 12, 2023
8d065e9
Update internal/cmd/buildtool/internal/buildtooltest/buildtooltest.go
bassosimone Oct 12, 2023
f5ff101
x
bassosimone Oct 12, 2023
5e3f7b8
Merge branch 'issue/2564' of github.com:ooni/probe-cli into issue/2564
bassosimone Oct 12, 2023
9b909a4
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
6 changes: 3 additions & 3 deletions internal/cmd/buildtool/internal/buildtooltest/buildtooltest.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ func CheckSingleCommand(cmd *execabs.Cmd, tee ExecExpectations) error {
return err
}
if err := CompareEnv(tee.Env, shellxtesting.CmdEnvironMinusOsEnviron(cmd)); err != nil {
return err
return fmt.Errorf("in %v: %w", tee.Argv, err)
}
return nil
}
Expand Down Expand Up @@ -253,12 +253,12 @@ func (*DependenciesCallCounter) XCRun(args ...string) string {
case "-sdk":
runtimex.Assert(len(args) == 3, "expected three arguments")
runtimex.Assert(args[2] == "--show-sdk-path", "the third argument must be --show-sdk-path")
return filepath.Join("Developer", "SDKs", args[1])
return string(filepath.Separator) + filepath.Join("Developer", "SDKs", args[1])

case "-find":
runtimex.Assert(len(args) == 4, "expected four arguments")
runtimex.Assert(args[1] == "-sdk", "the second argument must be -sdk")
return filepath.Join("Developer", "SDKs", args[2], "bin", args[3])
return string(filepath.Separator) + filepath.Join("", "Developer", "SDKs", args[2], "bin", args[3])
bassosimone marked this conversation as resolved.
Show resolved Hide resolved

default:
panic(errors.New("the first argument must be -sdk or -find"))
Expand Down
2 changes: 1 addition & 1 deletion internal/cmd/buildtool/ios.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,9 +150,9 @@ func iosNewCBuildEnv(deps buildtoolmodel.Dependencies, ooniArch string) *cBuildE
CFLAGS: []string{
"-isysroot", isysroot,
minVersionFlag + iosMinVersion, // tricky: they must be concatenated
"-O2",
"-arch", appleArch,
"-fembed-bitcode",
"-O2",
},
CONFIGURE_HOST: "", // later
DESTDIR: destdir,
Expand Down
Loading
Loading