You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by zw...@apache.org on 2018/05/17 22:30:23 UTC
[trafficserver] branch master updated: Restores the expected
non-tab indentations
This is an automated email from the ASF dual-hosted git repository.
zwoop pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
The following commit(s) were added to refs/heads/master by this push:
new 626ad19 Restores the expected non-tab indentations
626ad19 is described below
commit 626ad19ed92e81029ffd16cb67d9a49debfcd41d
Author: Leif Hedstrom <zw...@apache.org>
AuthorDate: Thu May 17 15:53:45 2018 -0600
Restores the expected non-tab indentations
---
.editorconfig | 4 +++
ci/jenkins/bin/autest.sh | 30 +++++++++---------
ci/jenkins/bin/build.sh | 14 ++++-----
ci/jenkins/bin/clang-analyzer.sh | 34 ++++++++++-----------
ci/jenkins/bin/environment.sh | 66 ++++++++++++++++++++--------------------
ci/jenkins/bin/github.sh | 14 ++++-----
ci/jenkins/bin/in_tree.sh | 12 ++++----
ci/jenkins/bin/out_of_tree.sh | 12 ++++----
ci/jenkins/bin/snapshot.sh | 12 ++++----
ci/jenkins/git-jenkins-setup.sh | 22 +++++++-------
ci/jenkins/git-jenkins-update.sh | 18 +++++------
11 files changed, 121 insertions(+), 117 deletions(-)
diff --git a/.editorconfig b/.editorconfig
index f331798..b1fb74b 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -39,9 +39,13 @@ charset = utf-8
[{*.pm,*.pl}]
indent_size = 4
charset = utf-8
+# Shell scripts
+[*.sh]
+indent_size = 4
# Makefile's
[*.am]
trim_trailing_whitespace = false
indent_style = tab
[*.rst]
max_line_length = 80
+indent_size = 3
diff --git a/ci/jenkins/bin/autest.sh b/ci/jenkins/bin/autest.sh
index 786ace7..c55fe6b 100755
--- a/ci/jenkins/bin/autest.sh
+++ b/ci/jenkins/bin/autest.sh
@@ -50,13 +50,13 @@ set -x
# Configure
autoreconf -if
./configure --prefix="${INSTALL}" \
- --with-user=jenkins \
- --enable-experimental-plugins \
- --enable-example-plugins \
- ${CCACHE} \
- ${WCCP} \
- ${WERROR} \
- ${DEBUG}
+ --with-user=jenkins \
+ --enable-experimental-plugins \
+ --enable-example-plugins \
+ ${CCACHE} \
+ ${WCCP} \
+ ${WERROR} \
+ ${DEBUG}
# Build and run regressions
${ATS_MAKE} -j4 && ${ATS_MAKE} install
@@ -82,15 +82,15 @@ date
cd /var/tmp # To be safer
chmod -R a+r ${SANDBOX}
if [ "0" != "$status" ]; then
- if [ -d "$SANDBOX" ]; then
- find "$SANDBOX" -name \*.db -exec rm {} \;
- mv "$SANDBOX" /CA/autest
- echo "Sandbox is available at ${URL}/${AUSB}/"
- fi
- exit -1
+ if [ -d "$SANDBOX" ]; then
+ find "$SANDBOX" -name \*.db -exec rm {} \;
+ mv "$SANDBOX" /CA/autest
+ echo "Sandbox is available at ${URL}/${AUSB}/"
+ fi
+ exit -1
else
- [ -d "$SANDBOX" ] && rmdir "$SANDBOX"
- exit 0
+ [ -d "$SANDBOX" ] && rmdir "$SANDBOX"
+ exit 0
fi
set -x
diff --git a/ci/jenkins/bin/build.sh b/ci/jenkins/bin/build.sh
index 4f56eb5..a1e52fc 100755
--- a/ci/jenkins/bin/build.sh
+++ b/ci/jenkins/bin/build.sh
@@ -40,12 +40,12 @@ mkdir -p BUILDS && cd BUILDS
set -x
../configure \
- --prefix="${WORKSPACE}/${BUILD_NUMBER}/install" \
- --enable-experimental-plugins \
- --enable-example-plugins \
- --with-user=jenkins \
- ${CCACHE} \
- ${WERROR} \
- ${DEBUG}
+ --prefix="${WORKSPACE}/${BUILD_NUMBER}/install" \
+ --enable-experimental-plugins \
+ --enable-example-plugins \
+ --with-user=jenkins \
+ ${CCACHE} \
+ ${WERROR} \
+ ${DEBUG}
${ATS_MAKE} ${ATS_MAKE_FLAGS} V=1 Q=
diff --git a/ci/jenkins/bin/clang-analyzer.sh b/ci/jenkins/bin/clang-analyzer.sh
index f01955d..33fcbae 100755
--- a/ci/jenkins/bin/clang-analyzer.sh
+++ b/ci/jenkins/bin/clang-analyzer.sh
@@ -51,18 +51,18 @@ output="/tmp"
# Find a Jenkins output tree if possible
if [ "${JOB_NAME#*-github}" != "${JOB_NAME}" ]; then
- # This is a Github PR build, override the branch name accordingly
- ATS_BRANCH="github"
- if [ -w "${OUTPUT_BASE}/${ATS_BRANCH}" ]; then
- output="${OUTPUT_BASE}/${ATS_BRANCH}/${ghprbPullId}"
- [ ! -d "${output}"] && mkdir "${output}"
- fi
- github_pr=" PR #${ghprbPullId}"
- results_url="https://ci.trafficserver.apache.org/clang-analyzer/${ATS_BRANCH}/${ghprbPullId}/"
+ # This is a Github PR build, override the branch name accordingly
+ ATS_BRANCH="github"
+ if [ -w "${OUTPUT_BASE}/${ATS_BRANCH}" ]; then
+ output="${OUTPUT_BASE}/${ATS_BRANCH}/${ghprbPullId}"
+ [ ! -d "${output}"] && mkdir "${output}"
+ fi
+ github_pr=" PR #${ghprbPullId}"
+ results_url="https://ci.trafficserver.apache.org/clang-analyzer/${ATS_BRANCH}/${ghprbPullId}/"
else
- test -w "${OUTPUT_BASE}/${ATS_BRANCH}" && output="${OUTPUT_BASE}/${ATS_BRANCH}"
- github_pr=""
- results_url="https://ci.trafficserver.apache.org/clang-analyzer/${ATS_BRANCH}/"
+ test -w "${OUTPUT_BASE}/${ATS_BRANCH}" && output="${OUTPUT_BASE}/${ATS_BRANCH}"
+ github_pr=""
+ results_url="https://ci.trafficserver.apache.org/clang-analyzer/${ATS_BRANCH}/"
fi
# Tell scan-build to use clang as the underlying compiler to actually build
@@ -77,28 +77,28 @@ export CCC_CXX=${LLVM_BASE}/bin/clang++
[ "$output" != "/tmp" ] && echo "Results (if any) can be found at ${results_url}"
autoreconf -fi
${LLVM_BASE}/bin/scan-build ./configure ${configure} \
- CXXFLAGS="-stdlib=libc++ -I/opt/llvm/include/c++/v1 -std=c++17" \
- LDFLAGS="-L/opt/llvm/lib64 -Wl,-rpath=/opt/llvm/lib64"
+ CXXFLAGS="-stdlib=libc++ -I/opt/llvm/include/c++/v1 -std=c++17" \
+ LDFLAGS="-L/opt/llvm/lib64 -Wl,-rpath=/opt/llvm/lib64"
# Since we don't want the analyzer to look at LuaJIT, build it first
# without scan-build. The subsequent make will then skip it.
${ATS_MAKE} -j $NPROCS -C lib all-local V=1 Q=
${LLVM_BASE}/bin/scan-build ${checkers} ${options} -o ${output} \
- --html-title="clang-analyzer: ${ATS_BRANCH}${github_pr}" \
- ${ATS_MAKE} -j $NPROCS V=1 Q=
+ --html-title="clang-analyzer: ${ATS_BRANCH}${github_pr}" \
+ ${ATS_MAKE} -j $NPROCS V=1 Q=
status=$?
# Clean the work area unless NOCLEAN is set. This is jsut for debugging when you
# need to see what the generated build did.
if [ ! -z "$NOCLEAN" ]; then
- ${ATS_MAKE} distclean
+ ${ATS_MAKE} distclean
fi
[ "$output" != "/tmp" ] && echo "Results (if any) can be found at ${results_url}"
# Cleanup old reports, for main clang and github as well (if the local helper script is available)
if [ -x "/admin/bin/clean-clang.sh" ]; then
- /admin/bin/clean-clang.sh
+ /admin/bin/clean-clang.sh
fi
# Exit with the scan-build exit code (thanks to --status-bugs)
diff --git a/ci/jenkins/bin/environment.sh b/ci/jenkins/bin/environment.sh
index d48b8d2..3239815 100755
--- a/ci/jenkins/bin/environment.sh
+++ b/ci/jenkins/bin/environment.sh
@@ -60,41 +60,41 @@ echo "Branch is $ATS_BRANCH"
test "${JOB_NAME#*compiler=clang}" != "${JOB_NAME}" && enable_clang=1
if [ "1" == "$enable_clang" ]; then
- if [ -x "/usr/local/bin/clang++50" ]; then
- # For FreeBSD
- export CC="/usr/local/bin/clang50"
- export CXX="/usr/local/bin/clang++50"
- elif [ -x "/usr/bin/clang++-5.0" ]; then
- # For Ubuntu 17.x
- export CC="/usr/bin/clang-5.0"
- export CXX="/usr/bin/clang++-5.0"
- else
- export CC="clang"
- export CXX="clang++"
- fi
- export CXXFLAGS="-Qunused-arguments"
- export WITH_LIBCPLUSPLUS="yes"
+ if [ -x "/usr/local/bin/clang++50" ]; then
+ # For FreeBSD
+ export CC="/usr/local/bin/clang50"
+ export CXX="/usr/local/bin/clang++50"
+ elif [ -x "/usr/bin/clang++-5.0" ]; then
+ # For Ubuntu 17.x
+ export CC="/usr/bin/clang-5.0"
+ export CXX="/usr/bin/clang++-5.0"
+ else
+ export CC="clang"
+ export CXX="clang++"
+ fi
+ export CXXFLAGS="-Qunused-arguments"
+ export WITH_LIBCPLUSPLUS="yes"
elif [ "1" == "$enable_icc" ]; then
- source /opt/rh/devtoolset-7/enable
- source /opt/intel/bin/iccvars.sh intel64
- export CC=icc
- export CXX=icpc
+ source /opt/rh/devtoolset-7/enable
+ source /opt/intel/bin/iccvars.sh intel64
+ export CC=icc
+ export CXX=icpc
else
- # Default is gcc / g++
- export CC=gcc
- export CXX=g++
- # Only test for non standard compilers on ATS v7.x and later. ToDo: Remove this when 6.x is EOLifed.
- if test "$ATS_IS_7" == "yes"; then
- if test -f "/opt/rh/devtoolset-7/enable"; then
- # This changes the path such that gcc / g++ is the right version. This is for CentOS 6 / 7.
- source /opt/rh/devtoolset-7/enable
- echo "Enabling devtoolset-7"
- elif test -x "/usr/bin/g++-7"; then
- # This is for Debian platforms
- export CC=/usr/bin/gcc-7
- export CXX=/usr/bin/g++-7
- fi
- fi
+ # Default is gcc / g++
+ export CC=gcc
+ export CXX=g++
+ # Only test for non standard compilers on ATS v7.x and later. ToDo: Remove this when 6.x is EOLifed.
+ if test "$ATS_IS_7" == "yes"; then
+ if test -f "/opt/rh/devtoolset-7/enable"; then
+ # This changes the path such that gcc / g++ is the right version. This is for CentOS 6 / 7.
+ source /opt/rh/devtoolset-7/enable
+ echo "Enabling devtoolset-7"
+ elif test -x "/usr/bin/g++-7"; then
+ # This is for Debian platforms
+ export CC=/usr/bin/gcc-7
+ export CXX=/usr/bin/g++-7
+ fi
+ fi
fi
# Echo out compiler information
diff --git a/ci/jenkins/bin/github.sh b/ci/jenkins/bin/github.sh
index 9c7ad5f..ff884ea 100755
--- a/ci/jenkins/bin/github.sh
+++ b/ci/jenkins/bin/github.sh
@@ -45,13 +45,13 @@ set -x
autoreconf -if
./configure --prefix="${INSTALL}" \
- --with-user=jenkins \
- --enable-experimental-plugins \
- --enable-example-plugins \
- ${CCACHE} \
- ${WCCP} \
- ${WERROR} \
- ${DEBUG}
+ --with-user=jenkins \
+ --enable-experimental-plugins \
+ --enable-example-plugins \
+ ${CCACHE} \
+ ${WCCP} \
+ ${WERROR} \
+ ${DEBUG}
# Build and run regressions
${ATS_MAKE} ${ATS_MAKE_FLAGS} V=1 Q=
diff --git a/ci/jenkins/bin/in_tree.sh b/ci/jenkins/bin/in_tree.sh
index 575e979..2a1f2e4 100755
--- a/ci/jenkins/bin/in_tree.sh
+++ b/ci/jenkins/bin/in_tree.sh
@@ -22,12 +22,12 @@ cd "${WORKSPACE}/src"
autoreconf -fi
./configure \
- --with-user=jenkins \
- --enable-ccache \
- --enable-werror \
- --enable-experimental-plugins \
- --enable-example-plugins \
- --enable-wccp
+ --with-user=jenkins \
+ --enable-ccache \
+ --enable-werror \
+ --enable-experimental-plugins \
+ --enable-example-plugins \
+ --enable-wccp
${ATS_MAKE} -j5 V=1
#${ATS_MAKE} check VERBOSE=Y
diff --git a/ci/jenkins/bin/out_of_tree.sh b/ci/jenkins/bin/out_of_tree.sh
index 84a99e9..edc5273 100755
--- a/ci/jenkins/bin/out_of_tree.sh
+++ b/ci/jenkins/bin/out_of_tree.sh
@@ -23,12 +23,12 @@ cd "${WORKSPACE}/src"
autoreconf -fi
mkdir -p BUILDS && cd BUILDS
../configure \
- --with-user=jenkins \
- --enable-ccache \
- --enable-werror \
- --enable-experimental-plugins \
- --enable-example-plugins \
- --enable-wccp
+ --with-user=jenkins \
+ --enable-ccache \
+ --enable-werror \
+ --enable-experimental-plugins \
+ --enable-example-plugins \
+ --enable-wccp
${ATS_MAKE} -j5 V=1
#${ATS_MAKE} check VERBOSE=Y
diff --git a/ci/jenkins/bin/snapshot.sh b/ci/jenkins/bin/snapshot.sh
index 0b16bd9..c0abbd9 100755
--- a/ci/jenkins/bin/snapshot.sh
+++ b/ci/jenkins/bin/snapshot.sh
@@ -21,12 +21,12 @@ cd "${WORKSPACE}/src"
autoreconf -fi
./configure \
- --with-user=jenkins \
- --enable-ccache \
- --enable-debug \
- --enable-werror \
- --enable-experimental-plugins \
- --enable-example-plugins
+ --with-user=jenkins \
+ --enable-ccache \
+ --enable-debug \
+ --enable-werror \
+ --enable-experimental-plugins \
+ --enable-example-plugins
${ATS_MAKE} asf-dist
diff --git a/ci/jenkins/git-jenkins-setup.sh b/ci/jenkins/git-jenkins-setup.sh
index cd4fcb9..0c5d60e 100644
--- a/ci/jenkins/git-jenkins-setup.sh
+++ b/ci/jenkins/git-jenkins-setup.sh
@@ -27,23 +27,23 @@ set -e # exit on error
MASTER=trafficserver
branch() {
- local dname="$1" # directory name
- local bname="$2" # branch name
+ local dname="$1" # directory name
+ local bname="$2" # branch name
- git clone --local $MASTER ${dname}
- ( cd ${dname} && git checkout -b ${bname} origin/${bname})
+ git clone --local $MASTER ${dname}
+ (cd ${dname} && git checkout -b ${bname} origin/${bname})
}
-if [ ! -d $MASTER ] ; then
- git clone https://git-wip-us.apache.org/repos/asf/trafficserver.git $MASTER
+if [ ! -d $MASTER ]; then
+ git clone https://git-wip-us.apache.org/repos/asf/trafficserver.git $MASTER
fi
(
- cd $MASTER
- for branch in $(git branch -r | egrep 'origin/[0-9.x]+') ; do
- git checkout -b $(echo $branch | sed -es'|origin/||') $branch
- git checkout master
- done
+ cd $MASTER
+ for branch in $(git branch -r | egrep 'origin/[0-9.x]+'); do
+ git checkout -b $(echo $branch | sed -es'|origin/||') $branch
+ git checkout master
+ done
)
# The directory names corresponsing to the branches should match the names
diff --git a/ci/jenkins/git-jenkins-update.sh b/ci/jenkins/git-jenkins-update.sh
index 6dd8e52..ed9987c 100644
--- a/ci/jenkins/git-jenkins-update.sh
+++ b/ci/jenkins/git-jenkins-update.sh
@@ -26,19 +26,19 @@ set -e # exit on error
MASTER=trafficserver
(
- cd trafficserver
+ cd trafficserver
- # Pick up any new release branches ...
- for branch in $(git branch -r | egrep 'origin/[0-9.x]+') ; do
- git checkout -b $(echo $branch | sed -es'|origin/||') $branch || true
- git checkout master
- done
+ # Pick up any new release branches ...
+ for branch in $(git branch -r | egrep 'origin/[0-9.x]+'); do
+ git checkout -b $(echo $branch | sed -es'|origin/||') $branch || true
+ git checkout master
+ done
- git pull --all --verbose
+ git pull --all --verbose
)
-for repo in /Users/jenkins/git/trafficserver* ; do
- ( cd $repo && git pull )
+for repo in /Users/jenkins/git/trafficserver*; do
+ (cd $repo && git pull)
done
# vim: set sw=2 ts=2 sw=2 :
--
To stop receiving notification emails like this one, please contact
zwoop@apache.org.