From 4fbd6598af71ea1f1b9fb409e6af57f9204f172d Mon Sep 17 00:00:00 2001 From: BenceJanosSzabo <bence.janos.szabo@ericsson.com> Date: Fri, 9 Sep 2016 10:43:10 +0200 Subject: [PATCH] makefilescript test scripts: solaris compatible sed command Change-Id: I5bb22b63e21506f8006f58dc73b19b5039013011 Signed-off-by: BenceJanosSzabo <bence.janos.szabo@ericsson.com> --- .../makefileScript/ImprovedLinking/Scripts/a_command.sh | 3 ++- .../makefileScript/ImprovedLinking/Scripts/b_command.sh | 3 ++- .../compileonly/mfgen-tpd/makefileScript/Normal/command.sh | 3 ++- .../OneMakefileWithAllFiles/Scripts/a_command.sh | 3 ++- .../OneMakefileWithAllFiles/Scripts/b_command.sh | 3 ++- .../makefileScript/RecursiveHierarchy/Scripts/a_command.sh | 3 ++- .../makefileScript/RecursiveHierarchy/Scripts/b_command.sh | 3 ++- .../mfgen-tpd/makefileScript/WithMakefileDir/command.sh | 3 ++- .../mfgen-tpd/makefileScript/WithMakefileName/command.sh | 3 ++- .../mfgen-tpd/makefileScript/WithMakefilePath/command.sh | 3 ++- .../mfgen-tpd/makefileScript/WithReqConfig/command.sh | 3 ++- .../makefileScript/WithScriptDiffDir/Script/command.sh | 3 ++- 12 files changed, 24 insertions(+), 12 deletions(-) diff --git a/regression_test/compileonly/mfgen-tpd/makefileScript/ImprovedLinking/Scripts/a_command.sh b/regression_test/compileonly/mfgen-tpd/makefileScript/ImprovedLinking/Scripts/a_command.sh index f314fd7b8..435121318 100755 --- a/regression_test/compileonly/mfgen-tpd/makefileScript/ImprovedLinking/Scripts/a_command.sh +++ b/regression_test/compileonly/mfgen-tpd/makefileScript/ImprovedLinking/Scripts/a_command.sh @@ -1,5 +1,6 @@ #!/bin/sh -editcmd='/COMPILER_FLAGS/a SCRIPTFLAG=ImprovedLinkingA' +editcmd='/COMPILER_FLAGS/a\ +SCRIPTFLAG=ImprovedLinkingA' sed -e "$editcmd" <$1 >$2 diff --git a/regression_test/compileonly/mfgen-tpd/makefileScript/ImprovedLinking/Scripts/b_command.sh b/regression_test/compileonly/mfgen-tpd/makefileScript/ImprovedLinking/Scripts/b_command.sh index 33bba0e10..1d91af1e9 100755 --- a/regression_test/compileonly/mfgen-tpd/makefileScript/ImprovedLinking/Scripts/b_command.sh +++ b/regression_test/compileonly/mfgen-tpd/makefileScript/ImprovedLinking/Scripts/b_command.sh @@ -1,5 +1,6 @@ #!/bin/sh -editcmd='/COMPILER_FLAGS/a SCRIPTFLAG=ImprovedLinkingB' +editcmd='/COMPILER_FLAGS/a\ +SCRIPTFLAG=ImprovedLinkingB' sed -e "$editcmd" <$1 >$2 diff --git a/regression_test/compileonly/mfgen-tpd/makefileScript/Normal/command.sh b/regression_test/compileonly/mfgen-tpd/makefileScript/Normal/command.sh index e4155ae13..8b0257f87 100755 --- a/regression_test/compileonly/mfgen-tpd/makefileScript/Normal/command.sh +++ b/regression_test/compileonly/mfgen-tpd/makefileScript/Normal/command.sh @@ -1,5 +1,6 @@ #!/bin/sh -editcmd='/COMPILER_FLAGS/a SCRIPTFLAG=Normal' +editcmd='/COMPILER_FLAGS/a\ +SCRIPTFLAG=Normal' sed -e "$editcmd" <$1 >$2 diff --git a/regression_test/compileonly/mfgen-tpd/makefileScript/OneMakefileWithAllFiles/Scripts/a_command.sh b/regression_test/compileonly/mfgen-tpd/makefileScript/OneMakefileWithAllFiles/Scripts/a_command.sh index 66452bffe..d5324bd58 100755 --- a/regression_test/compileonly/mfgen-tpd/makefileScript/OneMakefileWithAllFiles/Scripts/a_command.sh +++ b/regression_test/compileonly/mfgen-tpd/makefileScript/OneMakefileWithAllFiles/Scripts/a_command.sh @@ -1,5 +1,6 @@ #!/bin/sh -editcmd='/COMPILER_FLAGS/a SCRIPTFLAG=OneMakefileWithAllFilesA' +editcmd='/COMPILER_FLAGS/a\ +SCRIPTFLAG=OneMakefileWithAllFilesA' sed -e "$editcmd" <$1 >$2 diff --git a/regression_test/compileonly/mfgen-tpd/makefileScript/OneMakefileWithAllFiles/Scripts/b_command.sh b/regression_test/compileonly/mfgen-tpd/makefileScript/OneMakefileWithAllFiles/Scripts/b_command.sh index 8510fd3ea..88020e5c2 100755 --- a/regression_test/compileonly/mfgen-tpd/makefileScript/OneMakefileWithAllFiles/Scripts/b_command.sh +++ b/regression_test/compileonly/mfgen-tpd/makefileScript/OneMakefileWithAllFiles/Scripts/b_command.sh @@ -1,5 +1,6 @@ #!/bin/sh -editcmd='/COMPILER_FLAGS/a SCRIPTFLAG=OneMakefileWithAllFilesB' +editcmd='/COMPILER_FLAGS/a\ +SCRIPTFLAG=OneMakefileWithAllFilesB' sed -e "$editcmd" <$1 >$2 diff --git a/regression_test/compileonly/mfgen-tpd/makefileScript/RecursiveHierarchy/Scripts/a_command.sh b/regression_test/compileonly/mfgen-tpd/makefileScript/RecursiveHierarchy/Scripts/a_command.sh index aacc8b1d8..f98ee30e0 100755 --- a/regression_test/compileonly/mfgen-tpd/makefileScript/RecursiveHierarchy/Scripts/a_command.sh +++ b/regression_test/compileonly/mfgen-tpd/makefileScript/RecursiveHierarchy/Scripts/a_command.sh @@ -1,5 +1,6 @@ #!/bin/sh -editcmd='/COMPILER_FLAGS/a SCRIPTFLAG=RecursiveHierarchyA' +editcmd='/COMPILER_FLAGS/a\ +SCRIPTFLAG=RecursiveHierarchyA' sed -e "$editcmd" <$1 >$2 diff --git a/regression_test/compileonly/mfgen-tpd/makefileScript/RecursiveHierarchy/Scripts/b_command.sh b/regression_test/compileonly/mfgen-tpd/makefileScript/RecursiveHierarchy/Scripts/b_command.sh index 1e53bcc1f..5cf8b5413 100755 --- a/regression_test/compileonly/mfgen-tpd/makefileScript/RecursiveHierarchy/Scripts/b_command.sh +++ b/regression_test/compileonly/mfgen-tpd/makefileScript/RecursiveHierarchy/Scripts/b_command.sh @@ -1,5 +1,6 @@ #!/bin/sh -editcmd='/COMPILER_FLAGS/a SCRIPTFLAG=RecursiveHierarchyB' +editcmd='/COMPILER_FLAGS/a\ +SCRIPTFLAG=RecursiveHierarchyB' sed -e "$editcmd" <$1 >$2 diff --git a/regression_test/compileonly/mfgen-tpd/makefileScript/WithMakefileDir/command.sh b/regression_test/compileonly/mfgen-tpd/makefileScript/WithMakefileDir/command.sh index 0c09898ff..cd69a9454 100755 --- a/regression_test/compileonly/mfgen-tpd/makefileScript/WithMakefileDir/command.sh +++ b/regression_test/compileonly/mfgen-tpd/makefileScript/WithMakefileDir/command.sh @@ -1,5 +1,6 @@ #!/bin/sh -editcmd='/COMPILER_FLAGS/a SCRIPTFLAG=WithMakefileDir' +editcmd='/COMPILER_FLAGS/a\ +SCRIPTFLAG=WithMakefileDir' sed -e "$editcmd" <$1 >$2 diff --git a/regression_test/compileonly/mfgen-tpd/makefileScript/WithMakefileName/command.sh b/regression_test/compileonly/mfgen-tpd/makefileScript/WithMakefileName/command.sh index 05ee12cf4..698b1c042 100755 --- a/regression_test/compileonly/mfgen-tpd/makefileScript/WithMakefileName/command.sh +++ b/regression_test/compileonly/mfgen-tpd/makefileScript/WithMakefileName/command.sh @@ -1,5 +1,6 @@ #!/bin/sh -editcmd='/COMPILER_FLAGS/a SCRIPTFLAG=WithMakefileName' +editcmd='/COMPILER_FLAGS/a\ +SCRIPTFLAG=WithMakefileName' sed -e "$editcmd" <$1 >$2 diff --git a/regression_test/compileonly/mfgen-tpd/makefileScript/WithMakefilePath/command.sh b/regression_test/compileonly/mfgen-tpd/makefileScript/WithMakefilePath/command.sh index 48758f393..63189b88e 100755 --- a/regression_test/compileonly/mfgen-tpd/makefileScript/WithMakefilePath/command.sh +++ b/regression_test/compileonly/mfgen-tpd/makefileScript/WithMakefilePath/command.sh @@ -1,5 +1,6 @@ #!/bin/sh -editcmd='/COMPILER_FLAGS/a SCRIPTFLAG=WithMakefilePath' +editcmd='/COMPILER_FLAGS/a\ +SCRIPTFLAG=WithMakefilePath' sed -e "$editcmd" <$1 >$2 diff --git a/regression_test/compileonly/mfgen-tpd/makefileScript/WithReqConfig/command.sh b/regression_test/compileonly/mfgen-tpd/makefileScript/WithReqConfig/command.sh index 47680bd8a..e3be4a3ce 100755 --- a/regression_test/compileonly/mfgen-tpd/makefileScript/WithReqConfig/command.sh +++ b/regression_test/compileonly/mfgen-tpd/makefileScript/WithReqConfig/command.sh @@ -1,5 +1,6 @@ #!/bin/sh -editcmd='/COMPILER_FLAGS/a SCRIPTFLAG=WithReqConfig' +editcmd='/COMPILER_FLAGS/a\ +SCRIPTFLAG=WithReqConfig' sed -e "$editcmd" <$1 >$2 diff --git a/regression_test/compileonly/mfgen-tpd/makefileScript/WithScriptDiffDir/Script/command.sh b/regression_test/compileonly/mfgen-tpd/makefileScript/WithScriptDiffDir/Script/command.sh index 2bb656b2d..0d6ddf2f4 100755 --- a/regression_test/compileonly/mfgen-tpd/makefileScript/WithScriptDiffDir/Script/command.sh +++ b/regression_test/compileonly/mfgen-tpd/makefileScript/WithScriptDiffDir/Script/command.sh @@ -1,5 +1,6 @@ #!/bin/sh -editcmd='/COMPILER_FLAGS/a SCRIPTFLAG=WithScriptDiffDir' +editcmd='/COMPILER_FLAGS/a\ +SCRIPTFLAG=WithScriptDiffDir' sed -e "$editcmd" <$1 >$2 -- GitLab