From: Karel Zak <kzak@redhat.com>
Date: Mon, 19 Jan 2009 21:37:52 +0000 (+0100)
Subject: tests: cleanup ts/cal scripts
X-Git-Tag: v2.15-rc1~177
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b319621a35a23d9403a151aaee12efc8519f491f;p=thirdparty%2Futil-linux.git

tests: cleanup ts/cal scripts

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/tests/ts/cal/1m b/tests/ts/cal/1m
index 53a1395eaf..1fe64cf908 100755
--- a/tests/ts/cal/1m
+++ b/tests/ts/cal/1m
@@ -15,12 +15,11 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
-. ./commands.sh
-. ./functions.sh
 
-TS_COMPONENT="cal"
+TS_TOPDIR="$(dirname $0)/../.."
 TS_DESC="1 month"
 
+. $TS_TOPDIR/functions.sh
 ts_init "$*"
 
 set -o pipefail
diff --git a/tests/ts/cal/3m b/tests/ts/cal/3m
index aa815f586d..e8b5da5e0b 100755
--- a/tests/ts/cal/3m
+++ b/tests/ts/cal/3m
@@ -15,12 +15,10 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
-. ./commands.sh
-. ./functions.sh
-
-TS_COMPONENT="cal"
+TS_TOPDIR="$(dirname $0)/../.."
 TS_DESC="3 months"
 
+. $TS_TOPDIR/functions.sh
 ts_init "$*"
 
 set -o pipefail
diff --git a/tests/ts/cal/year b/tests/ts/cal/year
index 769373a903..658c393f78 100755
--- a/tests/ts/cal/year
+++ b/tests/ts/cal/year
@@ -15,12 +15,10 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
-. ./commands.sh
-. ./functions.sh
-
-TS_COMPONENT="cal"
+TS_TOPDIR="$(dirname $0)/../.."
 TS_DESC="year"
 
+. $TS_TOPDIR/functions.sh
 ts_init "$*"
 
 set -o pipefail