Merge "Insert missing semicolon in test xml post-push command" into main am: 90ca895c53 am: de6749184d am: e373a0d1fc

Original change: https://android-review.googlesource.com/c/platform/external/linux-kselftest/+/2864656

Change-Id: Ia8859e9c7901dbfe6c8bcb67bc6e8a80a4c234e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

6 files changed, 6 insertions, 6 deletions

diff --git a/android/kselftest_template.xml b/android/kselftest_template.xml
index b12c857d696a..9f258ceac3a3 100644
--- a/android/kselftest_template.xml
+++ b/android/kselftest_template.xml
@@ -23,7 +23,7 @@
     <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer">
         <option name="cleanup" value="true" />
         <option name="push-file" key="{MODULE}" value="&ktest_dir;" />
-        <option name="post-push" value='chmod -R 755 &ktest_dir; find &ktest_dir; -type f | xargs grep -l -e "bin/sh" -e "bin/bash" | xargs sed -i -e "s?/bin/echo?echo?" -i -e "s?#!/bin/sh?#!/system/bin/sh?" -i -e "s?#!/bin/bash?#!/system/bin/sh?" || echo "There were no files to process"' />
+        <option name="post-push" value='chmod -R 755 &ktest_dir;; find &ktest_dir; -type f | xargs grep -l -e "bin/sh" -e "bin/bash" | xargs sed -i -e "s?/bin/echo?echo?" -i -e "s?#!/bin/sh?#!/system/bin/sh?" -i -e "s?#!/bin/bash?#!/system/bin/sh?" || echo "There were no files to process"' />
     </target_preparer>
 
     <test class="com.android.tradefed.testtype.binary.KernelTargetTest" >
diff --git a/android/vts_linux_kselftest_arm_32.xml b/android/vts_linux_kselftest_arm_32.xml
index 7685c6de7485..bef66b14fc60 100644
--- a/android/vts_linux_kselftest_arm_32.xml
+++ b/android/vts_linux_kselftest_arm_32.xml
@@ -27,7 +27,7 @@
     <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer">
         <option name="cleanup" value="true" />
         <option name="push-file" key="{MODULE}" value="&ktest_dir;" />
-        <option name="post-push" value='chmod -R 755 &ktest_dir; find &ktest_dir; -type f | xargs grep -l -e "bin/sh" -e "bin/bash" | xargs sed -i -e "s?/bin/echo?echo?" -i -e "s?#!/bin/sh?#!/system/bin/sh?" -i -e "s?#!/bin/bash?#!/system/bin/sh?" || echo "There were no files to process"' />
+        <option name="post-push" value='chmod -R 755 &ktest_dir;; find &ktest_dir; -type f | xargs grep -l -e "bin/sh" -e "bin/bash" | xargs sed -i -e "s?/bin/echo?echo?" -i -e "s?#!/bin/sh?#!/system/bin/sh?" -i -e "s?#!/bin/bash?#!/system/bin/sh?" || echo "There were no files to process"' />
     </target_preparer>
 
     <test class="com.android.tradefed.testtype.binary.KernelTargetTest" >
diff --git a/android/vts_linux_kselftest_arm_64.xml b/android/vts_linux_kselftest_arm_64.xml
index c96ba6fa4f0d..a665dcd15bde 100644
--- a/android/vts_linux_kselftest_arm_64.xml
+++ b/android/vts_linux_kselftest_arm_64.xml
@@ -27,7 +27,7 @@
     <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer">
         <option name="cleanup" value="true" />
         <option name="push-file" key="{MODULE}" value="&ktest_dir;" />
-        <option name="post-push" value='chmod -R 755 &ktest_dir; find &ktest_dir; -type f | xargs grep -l -e "bin/sh" -e "bin/bash" | xargs sed -i -e "s?/bin/echo?echo?" -i -e "s?#!/bin/sh?#!/system/bin/sh?" -i -e "s?#!/bin/bash?#!/system/bin/sh?" || echo "There were no files to process"' />
+        <option name="post-push" value='chmod -R 755 &ktest_dir;; find &ktest_dir; -type f | xargs grep -l -e "bin/sh" -e "bin/bash" | xargs sed -i -e "s?/bin/echo?echo?" -i -e "s?#!/bin/sh?#!/system/bin/sh?" -i -e "s?#!/bin/bash?#!/system/bin/sh?" || echo "There were no files to process"' />
     </target_preparer>
 
     <test class="com.android.tradefed.testtype.binary.KernelTargetTest" >
diff --git a/android/vts_linux_kselftest_riscv_64.xml b/android/vts_linux_kselftest_riscv_64.xml
index 1f303035ae6a..840fb831d809 100644
--- a/android/vts_linux_kselftest_riscv_64.xml
+++ b/android/vts_linux_kselftest_riscv_64.xml
@@ -27,7 +27,7 @@
     <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer">
         <option name="cleanup" value="true" />
         <option name="push-file" key="{MODULE}" value="&ktest_dir;" />
-        <option name="post-push" value='chmod -R 755 &ktest_dir; find &ktest_dir; -type f | xargs grep -l -e "bin/sh" -e "bin/bash" | xargs sed -i -e "s?/bin/echo?echo?" -i -e "s?#!/bin/sh?#!/system/bin/sh?" -i -e "s?#!/bin/bash?#!/system/bin/sh?" || echo "There were no files to process"' />
+        <option name="post-push" value='chmod -R 755 &ktest_dir;; find &ktest_dir; -type f | xargs grep -l -e "bin/sh" -e "bin/bash" | xargs sed -i -e "s?/bin/echo?echo?" -i -e "s?#!/bin/sh?#!/system/bin/sh?" -i -e "s?#!/bin/bash?#!/system/bin/sh?" || echo "There were no files to process"' />
     </target_preparer>
 
     <test class="com.android.tradefed.testtype.binary.KernelTargetTest" >
diff --git a/android/vts_linux_kselftest_x86_32.xml b/android/vts_linux_kselftest_x86_32.xml
index 807b66d003bf..9b96d16e2dcf 100644
--- a/android/vts_linux_kselftest_x86_32.xml
+++ b/android/vts_linux_kselftest_x86_32.xml
@@ -27,7 +27,7 @@
     <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer">
         <option name="cleanup" value="true" />
         <option name="push-file" key="{MODULE}" value="&ktest_dir;" />
-        <option name="post-push" value='chmod -R 755 &ktest_dir; find &ktest_dir; -type f | xargs grep -l -e "bin/sh" -e "bin/bash" | xargs sed -i -e "s?/bin/echo?echo?" -i -e "s?#!/bin/sh?#!/system/bin/sh?" -i -e "s?#!/bin/bash?#!/system/bin/sh?" || echo "There were no files to process"' />
+        <option name="post-push" value='chmod -R 755 &ktest_dir;; find &ktest_dir; -type f | xargs grep -l -e "bin/sh" -e "bin/bash" | xargs sed -i -e "s?/bin/echo?echo?" -i -e "s?#!/bin/sh?#!/system/bin/sh?" -i -e "s?#!/bin/bash?#!/system/bin/sh?" || echo "There were no files to process"' />
     </target_preparer>
 
     <test class="com.android.tradefed.testtype.binary.KernelTargetTest" >
diff --git a/android/vts_linux_kselftest_x86_64.xml b/android/vts_linux_kselftest_x86_64.xml
index 2dd249184004..7fc6c0fb3ab0 100644
--- a/android/vts_linux_kselftest_x86_64.xml
+++ b/android/vts_linux_kselftest_x86_64.xml
@@ -27,7 +27,7 @@
     <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer">
         <option name="cleanup" value="true" />
         <option name="push-file" key="{MODULE}" value="&ktest_dir;" />
-        <option name="post-push" value='chmod -R 755 &ktest_dir; find &ktest_dir; -type f | xargs grep -l -e "bin/sh" -e "bin/bash" | xargs sed -i -e "s?/bin/echo?echo?" -i -e "s?#!/bin/sh?#!/system/bin/sh?" -i -e "s?#!/bin/bash?#!/system/bin/sh?" || echo "There were no files to process"' />
+        <option name="post-push" value='chmod -R 755 &ktest_dir;; find &ktest_dir; -type f | xargs grep -l -e "bin/sh" -e "bin/bash" | xargs sed -i -e "s?/bin/echo?echo?" -i -e "s?#!/bin/sh?#!/system/bin/sh?" -i -e "s?#!/bin/bash?#!/system/bin/sh?" || echo "There were no files to process"' />
     </target_preparer>
 
     <test class="com.android.tradefed.testtype.binary.KernelTargetTest" >