fastlane
diff --git a/‎scan/lib/scan/runner.rb‎
Lines changed: 7 additions & 1 deletion b/‎scan/lib/scan/runner.rb‎
Lines changed: 7 additions & 1 deletion
diff --git a/‎scan/spec/runner_spec.rb‎
Lines changed: 31 additions & 0 deletions b/‎scan/spec/runner_spec.rb‎
Lines changed: 31 additions & 0 deletions
@@ -264,7 +264,13 @@ def handle_results(tests_exit_status)
       zip_build_products
       copy_xctestrun
 
-      return nil if Scan.config[:build_for_testing]
+      # Ensure we still fail the step on any non-zero exit status from xcodebuild.
+      if Scan.config[:build_for_testing]
+        unless tests_exit_status == 0
+          UI.build_failure!("Build for testing failed. Exit status: #{tests_exit_status}")
+        end
+        return nil
+      end
 
       results = trainer_test_results
 
 
@@ -173,6 +173,37 @@
           end.to raise_error(FastlaneCore::Interface::FastlaneTestFailure, "Test execution failed. Exit status: 1")
         end
       end
+
+      describe "when :build_for_testing is true" do
+        it "fails the run if xcodebuild exits with a non-zero status even when error output contains 'Executed'", requires_xcodebuild: true do
+          Scan.config = FastlaneCore::Configuration.create(Scan::Options.available_options, {
+            output_directory: '/tmp/scan_results',
+            project: './scan/examples/standard/app.xcodeproj',
+            build_for_testing: true,
+            fail_build: true
+          })
+
+          test_command_generator = @scan.instance_variable_get(:@test_command_generator)
+          allow(test_command_generator).to receive(:generate).and_return("xcodebuild build-for-testing")
+
+          error_output = <<~ERROR
+            Some random xcodebuild failure output
+            /tmp/MyAppTestsFileThatContainsWordExecuted.swift:12: error: Something broke
+          ERROR
+
+          expect(Scan::ErrorHandler).to receive(:handle_build_error).with(error_output, anything).and_call_original
+
+          allow(FastlaneCore::CommandExecutor).to receive(:execute) do |command:, print_all:, print_command:, prefix:, loading:, suppress_output:, error:|
+            system("ruby -e 'exit 65'")
+            error.call(error_output)
+            ""
+          end
+
+          expect do
+            @scan.run
+          end.to raise_error(FastlaneCore::Interface::FastlaneBuildFailure, "Build for testing failed. Exit status: 65")
+        end
+      end
     end
 
     describe "retry_execute" do