[Fuego] [PATCH 06/18] LTP: patch runtests before running

Daniel Sangorrin daniel.sangorrin at toshiba.co.jp
Tue Jan 30 09:59:24 UTC 2018


The reason is that we want to support use cases where the
LTP is installed by the user.

Signed-off-by: Daniel Sangorrin <daniel.sangorrin at toshiba.co.jp>
---
 engine/tests/Functional.LTP/fuego_test.sh        |  5 +++--
 engine/tests/Functional.LTP/shorter-fork13.patch | 11 -----------
 2 files changed, 3 insertions(+), 13 deletions(-)
 delete mode 100644 engine/tests/Functional.LTP/shorter-fork13.patch

diff --git a/engine/tests/Functional.LTP/fuego_test.sh b/engine/tests/Functional.LTP/fuego_test.sh
index 1305421..8278e98 100755
--- a/engine/tests/Functional.LTP/fuego_test.sh
+++ b/engine/tests/Functional.LTP/fuego_test.sh
@@ -117,8 +117,6 @@ function test_pre_check {
 function test_build {
     if [[ "$FUNCTIONAL_LTP_PHASES" == *build* ]] ; then
         echo "Building LTP"
-        patch -p1 -N -s < $TEST_HOME/shorter-fork13.patch
-
         # Build the LTP tests
         make autotools
         ./configure CC="${CC}" AR="${AR}" RANLIB="${RANLIB}" LDFLAGS="$LDFLAGS" SYSROOT="${SDKROOT}" \
@@ -190,6 +188,9 @@ function test_run {
     if [[ "$FUNCTIONAL_LTP_PHASES" == *run* ]] ; then
         echo "Running LTP"
 
+        # we patch them here because of the different phases
+        cmd "sed -i 's/^fork13 fork13 -i 1000000/fork13 fork13 -i 100000/' $LTP_DESTDIR/runtest/syscalls"
+
         TESTS=""
         PTSTESTS=""
         RTTESTS=""
diff --git a/engine/tests/Functional.LTP/shorter-fork13.patch b/engine/tests/Functional.LTP/shorter-fork13.patch
deleted file mode 100644
index 09e8365..0000000
--- a/engine/tests/Functional.LTP/shorter-fork13.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/runtest/syscalls	2017-08-25 00:15:46.584034299 +0000
-+++ b/runtest/syscalls	2017-08-25 00:15:33.880034153 +0000
-@@ -295,7 +295,7 @@ fork08 fork08
- fork09 fork09
- fork10 fork10
- fork11 fork11
--fork13 fork13 -i 1000000
-+fork13 fork13 -i 100000
- fork14 fork14
- 
- fpathconf01 fpathconf01
-- 
2.7.4




More information about the Fuego mailing list