[OE-core] [PATCH] ltp: Use patch generated without -M
Martin Jansa
martin.jansa at gmail.com
Fri Dec 13 02:37:18 UTC 2013
* in my builds both versions worked, but Saul reported that it fails to
apply with:
Applying patch
0001-Rename-runtests_noltp.sh-script-so-have-unique-name.patch
patch: **** Only garbage was found in the patch input.
Now I've see the same issue on different builder (with Ubuntu 12.04).
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
---
...tests_noltp.sh-script-so-have-unique-name.patch | 190 +++++++++++++++++++--
1 file changed, 177 insertions(+), 13 deletions(-)
diff --git a/meta/recipes-extended/ltp/ltp/0001-Rename-runtests_noltp.sh-script-so-have-unique-name.patch b/meta/recipes-extended/ltp/ltp/0001-Rename-runtests_noltp.sh-script-so-have-unique-name.patch
index 74abe56..1b4d232 100644
--- a/meta/recipes-extended/ltp/ltp/0001-Rename-runtests_noltp.sh-script-so-have-unique-name.patch
+++ b/meta/recipes-extended/ltp/ltp/0001-Rename-runtests_noltp.sh-script-so-have-unique-name.patch
@@ -19,20 +19,184 @@ Upstream-Status: Pending
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
---
- .../kernel/containers/sysvipc/{runtests_noltp.sh => runipctests_noltp.sh} | 0
- .../kernel/containers/utsname/{runtests_noltp.sh => runutstests_noltp.sh} | 0
- 2 files changed, 0 insertions(+), 0 deletions(-)
- rename testcases/kernel/containers/sysvipc/{runtests_noltp.sh => runipctests_noltp.sh} (100%)
- rename testcases/kernel/containers/utsname/{runtests_noltp.sh => runutstests_noltp.sh} (100%)
+ .../kernel/containers/sysvipc/runipctests_noltp.sh | 31 ++++++++++++++++
+ .../kernel/containers/sysvipc/runtests_noltp.sh | 31 ----------------
+ .../kernel/containers/utsname/runtests_noltp.sh | 41 ----------------------
+ .../kernel/containers/utsname/runutstests_noltp.sh | 41 ++++++++++++++++++++++
+ 4 files changed, 72 insertions(+), 72 deletions(-)
+ create mode 100644 testcases/kernel/containers/sysvipc/runipctests_noltp.sh
+ delete mode 100644 testcases/kernel/containers/sysvipc/runtests_noltp.sh
+ delete mode 100755 testcases/kernel/containers/utsname/runtests_noltp.sh
+ create mode 100755 testcases/kernel/containers/utsname/runutstests_noltp.sh
-diff --git a/testcases/kernel/containers/sysvipc/runtests_noltp.sh b/testcases/kernel/containers/sysvipc/runipctests_noltp.sh
-similarity index 100%
-rename from testcases/kernel/containers/sysvipc/runtests_noltp.sh
-rename to testcases/kernel/containers/sysvipc/runipctests_noltp.sh
-diff --git a/testcases/kernel/containers/utsname/runtests_noltp.sh b/testcases/kernel/containers/utsname/runutstests_noltp.sh
-similarity index 100%
-rename from testcases/kernel/containers/utsname/runtests_noltp.sh
-rename to testcases/kernel/containers/utsname/runutstests_noltp.sh
+diff --git a/testcases/kernel/containers/sysvipc/runipctests_noltp.sh b/testcases/kernel/containers/sysvipc/runipctests_noltp.sh
+new file mode 100644
+index 0000000..84f398f
+--- /dev/null
++++ b/testcases/kernel/containers/sysvipc/runipctests_noltp.sh
+@@ -0,0 +1,31 @@
++#!/bin/sh
++################################################################################
++## ##
++## Copyright (c) International Business Machines Corp., 2007 ##
++## ##
++## This program is free software; you can redistribute it and#or modify ##
++## it under the terms of the GNU General Public License as published by ##
++## the Free Software Foundation; either version 2 of the License, or ##
++## (at your option) any later version. ##
++## ##
++## This program is distributed in the hope that it will be useful, but ##
++## WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY ##
++## or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License ##
++## for more details. ##
++## ##
++## You should have received a copy of the GNU General Public License ##
++## along with this program; if not, write to the Free Software ##
++## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ##
++## ##
++################################################################################
++
++exit_code=0
++echo "sysvipc tests"
++for type in none clone unshare; do
++ echo "**sysvipc $type"
++ ./shmnstest_noltp $type
++ if [ $? -ne 0 ]; then
++ exit_code=$?
++ fi
++done
++exit $exit_code
+diff --git a/testcases/kernel/containers/sysvipc/runtests_noltp.sh b/testcases/kernel/containers/sysvipc/runtests_noltp.sh
+deleted file mode 100644
+index 84f398f..0000000
+--- a/testcases/kernel/containers/sysvipc/runtests_noltp.sh
++++ /dev/null
+@@ -1,31 +0,0 @@
+-#!/bin/sh
+-################################################################################
+-## ##
+-## Copyright (c) International Business Machines Corp., 2007 ##
+-## ##
+-## This program is free software; you can redistribute it and#or modify ##
+-## it under the terms of the GNU General Public License as published by ##
+-## the Free Software Foundation; either version 2 of the License, or ##
+-## (at your option) any later version. ##
+-## ##
+-## This program is distributed in the hope that it will be useful, but ##
+-## WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY ##
+-## or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License ##
+-## for more details. ##
+-## ##
+-## You should have received a copy of the GNU General Public License ##
+-## along with this program; if not, write to the Free Software ##
+-## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ##
+-## ##
+-################################################################################
+-
+-exit_code=0
+-echo "sysvipc tests"
+-for type in none clone unshare; do
+- echo "**sysvipc $type"
+- ./shmnstest_noltp $type
+- if [ $? -ne 0 ]; then
+- exit_code=$?
+- fi
+-done
+-exit $exit_code
+diff --git a/testcases/kernel/containers/utsname/runtests_noltp.sh b/testcases/kernel/containers/utsname/runtests_noltp.sh
+deleted file mode 100755
+index 43cb7e2..0000000
+--- a/testcases/kernel/containers/utsname/runtests_noltp.sh
++++ /dev/null
+@@ -1,41 +0,0 @@
+-#!/bin/sh
+-################################################################################
+-## ##
+-## Copyright (c) International Business Machines Corp., 2007 ##
+-## ##
+-## This program is free software; you can redistribute it and#or modify ##
+-## it under the terms of the GNU General Public License as published by ##
+-## the Free Software Foundation; either version 2 of the License, or ##
+-## (at your option) any later version. ##
+-## ##
+-## This program is distributed in the hope that it will be useful, but ##
+-## WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY ##
+-## or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License ##
+-## for more details. ##
+-## ##
+-## You should have received a copy of the GNU General Public License ##
+-## along with this program; if not, write to the Free Software ##
+-## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ##
+-## ##
+-################################################################################
+-
+-oldhostname=`hostname`
+-exit_code=0
+-echo "unshare tests"
+-for i in `seq 1 5`; do
+- echo "test $i (unshare)"
+- ./utstest_noltp unshare $i
+- if [ $? -ne 0 ]; then
+- exit_code=$?
+- fi
+-done
+-echo "clone tests"
+-for i in `seq 1 5`; do
+- echo "test $i (clone)"
+- ./utstest_noltp clone $i
+- if [ $? -ne 0 ]; then
+- exit_code=$?
+- fi
+-done
+-hostname "$oldhostname"
+-exit $exit_code
+diff --git a/testcases/kernel/containers/utsname/runutstests_noltp.sh b/testcases/kernel/containers/utsname/runutstests_noltp.sh
+new file mode 100755
+index 0000000..43cb7e2
+--- /dev/null
++++ b/testcases/kernel/containers/utsname/runutstests_noltp.sh
+@@ -0,0 +1,41 @@
++#!/bin/sh
++################################################################################
++## ##
++## Copyright (c) International Business Machines Corp., 2007 ##
++## ##
++## This program is free software; you can redistribute it and#or modify ##
++## it under the terms of the GNU General Public License as published by ##
++## the Free Software Foundation; either version 2 of the License, or ##
++## (at your option) any later version. ##
++## ##
++## This program is distributed in the hope that it will be useful, but ##
++## WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY ##
++## or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License ##
++## for more details. ##
++## ##
++## You should have received a copy of the GNU General Public License ##
++## along with this program; if not, write to the Free Software ##
++## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ##
++## ##
++################################################################################
++
++oldhostname=`hostname`
++exit_code=0
++echo "unshare tests"
++for i in `seq 1 5`; do
++ echo "test $i (unshare)"
++ ./utstest_noltp unshare $i
++ if [ $? -ne 0 ]; then
++ exit_code=$?
++ fi
++done
++echo "clone tests"
++for i in `seq 1 5`; do
++ echo "test $i (clone)"
++ ./utstest_noltp clone $i
++ if [ $? -ne 0 ]; then
++ exit_code=$?
++ fi
++done
++hostname "$oldhostname"
++exit $exit_code
--
1.8.4.3
--
1.8.4.3
More information about the Openembedded-core
mailing list