[LNT] r310749 - Consistently indent shell scripts with 4 spaces
Matthias Braun via llvm-commits
llvm-commits at lists.llvm.org
Fri Aug 11 12:42:57 PDT 2017
Author: matze
Date: Fri Aug 11 12:42:57 2017
New Revision: 310749
URL: http://llvm.org/viewvc/llvm-project?rev=310749&view=rev
Log:
Consistently indent shell scripts with 4 spaces
I accidentally introduced a bunch of tabs in previous commits.
Modified:
lnt/trunk/tests/SharedInputs/mysql_wrapper.sh
lnt/trunk/tests/SharedInputs/postgres_wrapper.sh
lnt/trunk/tests/SharedInputs/server_wrapper.sh
Modified: lnt/trunk/tests/SharedInputs/mysql_wrapper.sh
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/tests/SharedInputs/mysql_wrapper.sh?rev=310749&r1=310748&r2=310749&view=diff
==============================================================================
--- lnt/trunk/tests/SharedInputs/mysql_wrapper.sh (original)
+++ lnt/trunk/tests/SharedInputs/mysql_wrapper.sh Fri Aug 11 12:42:57 2017
@@ -13,8 +13,8 @@ set -eu
DBDIR="$1"
shift
if [ -d "${DBDIR}" ]; then
- echo 1>&2 "${DBDIR} already exists"
- exit 1
+ echo 1>&2 "${DBDIR} already exists"
+ exit 1
fi
PORT="$1"
shift
@@ -35,9 +35,9 @@ MYSQL_INSTALL_DB_FLAGS+=" --user=$(whoam
MYSQL_INSTALL_DB_FLAGS+=" --datadir=\"${DBDIR}/data\""
MYSQL_INSTALL_DB_FLAGS+=" >& \"${DBDIR}/install_db.log\""
#echo "$ mysql_install_db ${MYSQL_INSTALL_DB_FLAGS}"
-#eval mysql_install_db ${MYSQL_INSTALL_DB_FLAGS}
+#eval mysql_install_db ${MYSQL_INSTALL_DB_FLAGS}
echo "$ mysqld ${MYSQL_INSTALL_DB_FLAGS}"
-eval mysqld ${MYSQL_INSTALL_DB_FLAGS}
+eval mysqld ${MYSQL_INSTALL_DB_FLAGS}
MYSQLD_FLAGS+=" --defaults-file=\"${DBDIR}/etc/my.cnf\""
Modified: lnt/trunk/tests/SharedInputs/postgres_wrapper.sh
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/tests/SharedInputs/postgres_wrapper.sh?rev=310749&r1=310748&r2=310749&view=diff
==============================================================================
--- lnt/trunk/tests/SharedInputs/postgres_wrapper.sh (original)
+++ lnt/trunk/tests/SharedInputs/postgres_wrapper.sh Fri Aug 11 12:42:57 2017
@@ -12,8 +12,8 @@ set -u
DBDIR="$1"
shift
if [ -d "${DBDIR}" ]; then
- echo 1>&2 "${DBDIR} already exists"
- exit 1
+ echo 1>&2 "${DBDIR} already exists"
+ exit 1
fi
mkdir -p "${DBDIR}"
Modified: lnt/trunk/tests/SharedInputs/server_wrapper.sh
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/tests/SharedInputs/server_wrapper.sh?rev=310749&r1=310748&r2=310749&view=diff
==============================================================================
--- lnt/trunk/tests/SharedInputs/server_wrapper.sh (original)
+++ lnt/trunk/tests/SharedInputs/server_wrapper.sh Fri Aug 11 12:42:57 2017
@@ -12,46 +12,46 @@
PROGRAM="$(basename $0)"
usage() {
- echo "usage: $PROGRAM <location of server files> <runtest type> <submit-through-url> <portnr> [arguments for lnt runtest]"
- echo "e.g: $PROGRAM /tmp/ nt yes --cc /bin/clang --sandbox /tmp/sandbox"
+ echo "usage: $PROGRAM <location of server files> <runtest type> <submit-through-url> <portnr> [arguments for lnt runtest]"
+ echo "e.g: $PROGRAM /tmp/ nt yes --cc /bin/clang --sandbox /tmp/sandbox"
}
error() {
- echo "error: $PROGRAM: $*" >&2
- usage >&2
- exit 1
+ echo "error: $PROGRAM: $*" >&2
+ usage >&2
+ exit 1
}
main() {
- [ $# -lt 2 ] &&
- error "not enough arguments"
+ [ $# -lt 2 ] &&
+ error "not enough arguments"
- local server_instance=$1
- local port_number=$2
- shift 2
+ local server_instance=$1
+ local port_number=$2
+ shift 2
- lnt runserver ${server_instance} --hostname localhost --port ${port_number} >& ${server_instance}/server_wrapper_runserver.log &
- local pid=$!
+ lnt runserver ${server_instance} --hostname localhost --port ${port_number} >& ${server_instance}/server_wrapper_runserver.log &
+ local pid=$!
- # Poll the server until it is up and running
- while ! curl http://localhost:${port_number}/ping -m1 -o/dev/null -s ; do
+ # Poll the server until it is up and running
+ while ! curl http://localhost:${port_number}/ping -m1 -o/dev/null -s ; do
# Maybe server is totally dead.
kill -0 ${pid} 2> /dev/null || { echo "Server exit detected"; cat ${server_instance}/server_wrapper_runserver.log; break; }
# If not sleep and keep trying.
sleep 0.1
done
- # Execute command.
- eval "$@"
- local rc=$?
-
- kill -15 ${pid}
- local kill_rc=$?
- [ ${kill_rc} -ne 0 ] &&
- error "wha happen?? ${kill_rc}"
-
- wait ${pid}
- exit ${rc}
+ # Execute command.
+ eval "$@"
+ local rc=$?
+
+ kill -15 ${pid}
+ local kill_rc=$?
+ [ ${kill_rc} -ne 0 ] &&
+ error "wha happen?? ${kill_rc}"
+
+ wait ${pid}
+ exit ${rc}
}
main "$@"
More information about the llvm-commits
mailing list