chore(buildtool): add ios-build unit tests

Part of ooni/probe#2564
ooni · Oct 12, 2023 · 9f4ce24 · 9f4ce24
1 parent 63edcbe
commit 9f4ce24
Show file tree

Hide file tree

Showing 3 changed files with 925 additions and 4 deletions.
diff --git a/internal/cmd/buildtool/internal/buildtooltest/buildtooltest.go b/internal/cmd/buildtool/internal/buildtooltest/buildtooltest.go
@@ -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
 }
@@ -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])
 
 	default:
 		panic(errors.New("the first argument must be -sdk or -find"))

diff --git a/internal/cmd/buildtool/ios.go b/internal/cmd/buildtool/ios.go
@@ -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,