diff options
author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2023-12-07 22:52:08 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2023-12-07 22:52:08 +0000 |
commit | 90ca895c53ab4ad20cc3a0339a1c97278690e5fd (patch) | |
tree | 3616593e7bd1efefe4ecd71f1ea1891e8f4df1f2 | |
parent | 5d9d3fcd362c9ef03ae8202e119a82d2d6b25ca8 (diff) | |
parent | ce706d7eafca72a0d0842a341b692d0d1e7629b4 (diff) | |
download | linux-kselftest-90ca895c53ab4ad20cc3a0339a1c97278690e5fd.tar.gz |
Merge "Insert missing semicolon in test xml post-push command" into main
-rw-r--r-- | android/kselftest_template.xml | 2 | ||||
-rw-r--r-- | android/vts_linux_kselftest_arm_32.xml | 2 | ||||
-rw-r--r-- | android/vts_linux_kselftest_arm_64.xml | 2 | ||||
-rw-r--r-- | android/vts_linux_kselftest_riscv_64.xml | 2 | ||||
-rw-r--r-- | android/vts_linux_kselftest_x86_32.xml | 2 | ||||
-rw-r--r-- | android/vts_linux_kselftest_x86_64.xml | 2 |
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" > |