From 556cb5a330b3be92a0b658d408969a7bacff28f6 Mon Sep 17 00:00:00 2001 From: Makoto Onuki Date: Fri, 20 Dec 2024 12:22:12 -0800 Subject: Clean up the rerun script. Use `set -x` to print the command line, instead of echo. Flag: EXEMPT host test change only Bug: 292141694 Test: $ANDROID_BUILD_TOP/frameworks/base/ravenwood/scripts/run-ravenwood-tests.sh Change-Id: Id7060207731ca6be102941af2adae42a8616df80 --- ravenwood/scripts/extract-last-soong-commands.py | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) (limited to '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 c08d4aa799a5..0629b77029e0 100755 --- a/ravenwood/scripts/extract-last-soong-commands.py +++ b/ravenwood/scripts/extract-last-soong-commands.py @@ -32,7 +32,7 @@ re_command = re.compile(r''' ^\[.*?\] \s* (.*) ''', re.X) 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 @@ def main(args): 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 -- cgit v1.2.3-59-g8ed1b