aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEdward Liaw <edliaw@google.com>2023-12-07 21:08:08 +0000
committerEdward Liaw <edliaw@google.com>2023-12-07 21:37:13 +0000
commitce706d7eafca72a0d0842a341b692d0d1e7629b4 (patch)
tree6420d98fe180f33c286e5befd16375716e473d55
parente2dac88019461f6c85e445bf1578778937e1c8f4 (diff)
downloadlinux-kselftest-ce706d7eafca72a0d0842a341b692d0d1e7629b4.tar.gz
Insert missing semicolon in test xml post-push command
Post-push was missing a semicolon after the chmod. Bug: 277261121 Fixes: ce06ca726b273 ("linux-kselftest: Use data field to copy test artifacts") Test: atest -a vts_linux_kselftest_x86_64 Change-Id: I3d6f8e9e53d7cf59e163eedb1be87d45ed70154f Signed-off-by: Edward Liaw <edliaw@google.com>
-rw-r--r--android/kselftest_template.xml2
-rw-r--r--android/vts_linux_kselftest_arm_32.xml2
-rw-r--r--android/vts_linux_kselftest_arm_64.xml2
-rw-r--r--android/vts_linux_kselftest_riscv_64.xml2
-rw-r--r--android/vts_linux_kselftest_x86_32.xml2
-rw-r--r--android/vts_linux_kselftest_x86_64.xml2
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" >