From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Thu, 9 Jul 2015 14:11:49 +0000 (+0100)
Subject: Use standard functions definitions.
X-Git-Tag: 1.0.0~403
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=aac27905de964f0f91f6a9366f596b1197d574ff;p=thirdparty%2Frspamd.git

Use standard functions definitions.
---

diff --git a/test/functional/functions.sh b/test/functional/functions.sh
index 7301669a2d..50c29948b2 100644
--- a/test/functional/functions.sh
+++ b/test/functional/functions.sh
@@ -1,5 +1,4 @@
-function save_error()
-{
+save_error() {
 	_where=$1
 	_reason=$2
 
@@ -10,8 +9,7 @@ function save_error()
 	exit 1
 }
 
-function run_rspamd() 
-{
+run_rspamd() {
 	RSPAMD_USER=${RSPAMD_USER:-"nobody"}
 	RSPAMD_GROUP=${RSPAMD_GROUP:-"nogroup"}
 	RSPAMD=${RSPAMD:-"$TEST_DIRNAME/../../src/rspamd"}
@@ -36,8 +34,7 @@ function run_rspamd()
 }
 
 
-function teardown() 
-{
+teardown() {
 	RSPAMD_PID=`cat ${TMPDIR}/rspamd.pid`
 
 	if [ F"${RSPAMD_PID}" != F"" ] ; then
@@ -58,8 +55,7 @@ function teardown()
 	fi
 }
 
-function check_output() 
-{
+check_output() {
 	_pattern="$1"
 
 	echo "$output" | egrep "$_pattern" > /dev/null 2>&1
@@ -74,8 +70,7 @@ function check_output()
 	return 0
 }
 
-function run_rspamc()
-{
+run_rspamc() {
 	_command=$1
 	shift
 	_rspamc="$TEST_DIRNAME/../../src/client/rspamc"
@@ -98,8 +93,7 @@ function run_rspamc()
 	return 1
 }
 
-function run()
-{
+run() {
 	_command=$1
 	shift
 
diff --git a/test/functional/tests.sh b/test/functional/tests.sh
index d6eb612a60..245ac7dd79 100644
--- a/test/functional/tests.sh
+++ b/test/functional/tests.sh
@@ -11,13 +11,11 @@ SKIPPED_TESTS=0
 
 . ${TEST_DIRNAME}/functions.sh
 
-function make_tempdir()
-{
+make_tempdir() {
 	export TMPDIR=`mktemp -d /tmp/rspamd-test-XXXXXX`
 }
 
-function run_test()
-{
+run_test() {
 	TEST_NAME=`basename $1 | sed -e 's/.sh$//'`
 	TEST_DESCRIPTION=`head -1 $1 | sed -e 's/^# *//'`