Codestyle changes
Addressing some indentation comments.
Change-Id: I04057408eae3ffb656c1f830bfc30b878ef36670
diff --git a/jenkins/build-config.jpl b/jenkins/build-config.jpl
index f2b29bd..ac27da8 100644
--- a/jenkins/build-config.jpl
+++ b/jenkins/build-config.jpl
@@ -48,17 +48,17 @@
)
}
sh """
-# Host https://github.com/Arm-software/CMSIS_5/releases/download/5.5.0/ARM.CMSIS.5.5.0.pack
-# under \$JENKINS_HOME/userContent
-set +e
-wget -O cmsis.pack -q \${JENKINS_URL}/userContent/ARM.CMSIS.${CMSIS_VERSION}.pack
-if [ "\$?" != "0" ] ; then
-set -e
-wget -O cmsis.pack -q https://github.com/Arm-software/CMSIS_5/releases/download/${CMSIS_VERSION}/ARM.CMSIS.${CMSIS_VERSION}.pack
-fi
-set -e
-unzip -o -d CMSIS_5 cmsis.pack
-"""
+ # Host https://github.com/Arm-software/CMSIS_5/releases/download/5.5.0/ARM.CMSIS.5.5.0.pack
+ # under \$JENKINS_HOME/userContent
+ set +e
+ wget -O cmsis.pack -q \${JENKINS_URL}/userContent/ARM.CMSIS.${CMSIS_VERSION}.pack
+ if [ "\$?" != "0" ] ; then
+ set -e
+ wget -O cmsis.pack -q https://github.com/Arm-software/CMSIS_5/releases/download/${CMSIS_VERSION}/ARM.CMSIS.${CMSIS_VERSION}.pack
+ fi
+ set -e
+ unzip -o -d CMSIS_5 cmsis.pack
+ """
if (env.PSA_API_SUITE != "") {
dir("psa-arch-tests") {
checkout(
diff --git a/jenkins/build-docs.jpl b/jenkins/build-docs.jpl
index 044dd45..bc284b2 100644
--- a/jenkins/build-docs.jpl
+++ b/jenkins/build-docs.jpl
@@ -43,17 +43,17 @@
)
}
sh """
-# Host https://github.com/Arm-software/CMSIS_5/releases/download/5.5.0/ARM.CMSIS.5.5.0.pack
-# under \$JENKINS_HOME/userContent
-set +e
-wget -O cmsis.pack -q \${JENKINS_URL}/userContent/ARM.CMSIS.${CMSIS_VERSION}.pack
-if [ "\$?" != "0" ] ; then
-set -e
-wget -O cmsis.pack -q https://github.com/Arm-software/CMSIS_5/releases/download/${CMSIS_VERSION}/ARM.CMSIS.${CMSIS_VERSION}.pack
-fi
-set -e
-unzip -o -d CMSIS_5 cmsis.pack
-"""
+ # Host https://github.com/Arm-software/CMSIS_5/releases/download/5.5.0/ARM.CMSIS.5.5.0.pack
+ # under \$JENKINS_HOME/userContent
+ set +e
+ wget -O cmsis.pack -q \${JENKINS_URL}/userContent/ARM.CMSIS.${CMSIS_VERSION}.pack
+ if [ "\$?" != "0" ] ; then
+ set -e
+ wget -O cmsis.pack -q https://github.com/Arm-software/CMSIS_5/releases/download/${CMSIS_VERSION}/ARM.CMSIS.${CMSIS_VERSION}.pack
+ fi
+ set -e
+ unzip -o -d CMSIS_5 cmsis.pack
+ """
}
try {
verify = 1
diff --git a/jenkins/checkpatch.jpl b/jenkins/checkpatch.jpl
index c105d4a..1db0f03 100644
--- a/jenkins/checkpatch.jpl
+++ b/jenkins/checkpatch.jpl
@@ -34,7 +34,7 @@
poll: false,
scm: [
$class: 'GitSCM',
- branches: [[name: 'FETCH_HEAD']],
+ branches: [[name: 'FETCH_HEAD']],
userRemoteConfigs: [[
refspec: 'refs/tags/$MBEDCRYPTO_VERSION',
url: params.MBEDCRYPTO_URL
@@ -43,17 +43,17 @@
)
}
sh """
-# Host https://github.com/Arm-software/CMSIS_5/releases/download/5.5.0/ARM.CMSIS.5.5.0.pack
-# under \$JENKINS_HOME/userContent
-set +e
-wget -O cmsis.pack -q \${JENKINS_URL}/userContent/ARM.CMSIS.${CMSIS_VERSION}.pack
-if [ "\$?" != "0" ] ; then
-set -e
-wget -O cmsis.pack -q https://github.com/Arm-software/CMSIS_5/releases/download/${CMSIS_VERSION}/ARM.CMSIS.${CMSIS_VERSION}.pack
-fi
-set -e
-unzip -o -d CMSIS_5 cmsis.pack
-"""
+ # Host https://github.com/Arm-software/CMSIS_5/releases/download/5.5.0/ARM.CMSIS.5.5.0.pack
+ # under \$JENKINS_HOME/userContent
+ set +e
+ wget -O cmsis.pack -q \${JENKINS_URL}/userContent/ARM.CMSIS.${CMSIS_VERSION}.pack
+ if [ "\$?" != "0" ] ; then
+ set -e
+ wget -O cmsis.pack -q https://github.com/Arm-software/CMSIS_5/releases/download/${CMSIS_VERSION}/ARM.CMSIS.${CMSIS_VERSION}.pack
+ fi
+ set -e
+ unzip -o -d CMSIS_5 cmsis.pack
+ """
}
stage("Check") {
def verify = 1
diff --git a/jenkins/cppcheck.jpl b/jenkins/cppcheck.jpl
index 8e79738..61e231d 100644
--- a/jenkins/cppcheck.jpl
+++ b/jenkins/cppcheck.jpl
@@ -34,7 +34,7 @@
poll: false,
scm: [
$class: 'GitSCM',
- branches: [[name: 'FETCH_HEAD']],
+ branches: [[name: 'FETCH_HEAD']],
userRemoteConfigs: [[
refspec: 'refs/tags/$MBEDCRYPTO_VERSION',
url: params.MBEDCRYPTO_URL
@@ -43,17 +43,17 @@
)
}
sh """
-# Host https://github.com/Arm-software/CMSIS_5/releases/download/5.5.0/ARM.CMSIS.5.5.0.pack
-# under \$JENKINS_HOME/userContent
-set +e
-wget -O cmsis.pack -q \${JENKINS_URL}/userContent/ARM.CMSIS.${CMSIS_VERSION}.pack
-if [ "\$?" != "0" ] ; then
-set -e
-wget -O cmsis.pack -q https://github.com/Arm-software/CMSIS_5/releases/download/${CMSIS_VERSION}/ARM.CMSIS.${CMSIS_VERSION}.pack
-fi
-set -e
-unzip -o -d CMSIS_5 cmsis.pack
-"""
+ # Host https://github.com/Arm-software/CMSIS_5/releases/download/5.5.0/ARM.CMSIS.5.5.0.pack
+ # under \$JENKINS_HOME/userContent
+ set +e
+ wget -O cmsis.pack -q \${JENKINS_URL}/userContent/ARM.CMSIS.${CMSIS_VERSION}.pack
+ if [ "\$?" != "0" ] ; then
+ set -e
+ wget -O cmsis.pack -q https://github.com/Arm-software/CMSIS_5/releases/download/${CMSIS_VERSION}/ARM.CMSIS.${CMSIS_VERSION}.pack
+ fi
+ set -e
+ unzip -o -d CMSIS_5 cmsis.pack
+ """
}
stage("Check") {
def verify = 1
diff --git a/run-cppcheck.sh b/run-cppcheck.sh
index 681d9fe..b1efb4d 100755
--- a/run-cppcheck.sh
+++ b/run-cppcheck.sh
@@ -130,14 +130,14 @@
if [ "$RAW_OUTPUT" == "0" ] ; then
# Always generate an empty file for other stages of ci expecting one
echo "Files Ignored: $flist"
- cat > chk-config.xml << EOF
-<?xml version="1.0" encoding="UTF-8"?>
-<results version="2">
- <cppcheck version="$(cppcheck --version)"/>
- <errors>
- </errors>
-</results>
-EOF
+ cat > chk-config.xml <<- EOF
+ <?xml version="1.0" encoding="UTF-8"?>
+ <results version="2">
+ <cppcheck version="$(cppcheck --version)"/>
+ <errors>
+ </errors>
+ </results>
+ EOF
cp chk-config.xml chk-src.xml
fi
exit 0