From 4c3c7fda252ec865b8794265d2a5b41d8b464f7b Mon Sep 17 00:00:00 2001 From: David Allsopp Date: Thu, 7 Jun 2018 14:06:20 +0100 Subject: [PATCH] Break long lines in Inria CI scripts It's tricky to do this elegantly in sh, sadly... --- tools/ci/inria/bootstrap | 6 ++++-- tools/ci/inria/extra-checks | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/tools/ci/inria/bootstrap b/tools/ci/inria/bootstrap index 814520b13..d9495e0ac 100755 --- a/tools/ci/inria/bootstrap +++ b/tools/ci/inria/bootstrap @@ -64,9 +64,11 @@ change_exe_magic_number() { new="$1" echo Changing executable magic number from ${old} to ${new} # Change magic number in byterun/caml/exec.h - sed -i 's/\x23define \+EXEC_MAGIC \+\x22'${old}'\x22/#define EXEC_MAGIC "'${new}'"/' byterun/caml/exec.h + sed -i 's/\x23define \+EXEC_MAGIC \+\x22'${old}\ +'\x22/#define EXEC_MAGIC "'${new}'"/' byterun/caml/exec.h # Change magic number in utils/config.mlp - sed -i 's/let \+exec_magic_number \+= \+\x22'${old}'\x22/let exec_magic_number = "'${new}'"/' utils/config.mlp + sed -i 's/let \+exec_magic_number \+= \+\x22'${old}\ +'\x22/let exec_magic_number = "'${new}'"/' utils/config.mlp } remove_primitive() diff --git a/tools/ci/inria/extra-checks b/tools/ci/inria/extra-checks index ec499e6f7..ad4d1237e 100755 --- a/tools/ci/inria/extra-checks +++ b/tools/ci/inria/extra-checks @@ -21,7 +21,8 @@ # In this context, it is necessary to skip a few tests whose behaviour # is modified by the instrumentation: -export OCAMLTEST_SKIP_TESTS="tests/afl-instrumentation/afltest.ml tests/runtime-errors/stackoverflow.ml" +export OCAMLTEST_SKIP_TESTS="tests/afl-instrumentation/afltest.ml \ +tests/runtime-errors/stackoverflow.ml" # To know the slave's architecture, this script looks at the OCAML_ARCH # environment variable. For a given node NODe, this variable can be defined