Merge "Insert missing semicolon in test xml post-push command" into main am: 90ca895c53
Original change: https://android-review.googlesource.com/c/platform/external/linux-kselftest/+/2864656
Change-Id: Ida1783699bb348e283de3f11dfa9061f093e512e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/android/kselftest_template.xml b/android/kselftest_template.xml
index b12c857..9f258ce 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 7685c6d..bef66b1 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 c96ba6f..a665dcd 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 1f30303..840fb83 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 807b66d..9b96d16e 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 2dd2491..7fc6c0f 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" >
