commit a17154f1d134e5a84d334104ed5aebbca91b34c4
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Fri Dec 20 15:27:14 2024 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Dec 20 15:27:14 2024 -0800
tree e90b64e09ccd64da9a54af756a78f76eff15bc91
parent ca007fa35e38500c95150ee40b1a9d652e4f4349
parent 556cb5a330b3be92a0b658d408969a7bacff28f6

Merge "Clean up the rerun script." into main

ravenwood/scripts/extract-last-soong-commands.py

diff --git a/ravenwood/scripts/extract-last-soong-commands.py b/ravenwood/scripts/extract-last-soong-commands.py
index c08d4aa..0629b77 100755
--- a/ravenwood/scripts/extract-last-soong-commands.py
+++ b/ravenwood/scripts/extract-last-soong-commands.py
@@ -32,7 +32,7 @@
 HEADER = r'''#!/bin/bash
 
 set -e # Stop on a failed command
-
+set -x # Print command line before executing
 cd "${ANDROID_BUILD_TOP:?}"
 
 '''
@@ -65,16 +65,8 @@
                     command = m.groups()[0]
 
                     count += 1
-                    out.write(f'### Command {count} ========\n')
-
-                    # Show the full command line before executing it.
-                    out.write('#echo ' + shlex.quote(command) + '\n')
-                    out.write('\n')
-
-                    # Execute the command.
-                    out.write('#' + command + '\n')
-
-                    out.write('\n')
+                    out.write(f'### Command {count} ========\n\n')
+                    out.write('#' + command + '\n\n')
 
                     continue