From 9c7d60135998fc7b701f097e014702cbd810bf58 Mon Sep 17 00:00:00 2001
From: Karel Zak <kzak@redhat.com>
Date: Wed, 18 Feb 2009 21:27:18 +0100
Subject: [PATCH] tests: cleanup ts/md5

Signed-off-by: Karel Zak <kzak@redhat.com>
---
 tests/expected/{ts-md5 => md5/md5}  |  0
 tests/{input/ts-md5 => ts/md5/data} |  0
 tests/{ts-md5 => ts/md5/md5}        | 17 ++++++-----------
 3 files changed, 6 insertions(+), 11 deletions(-)
 rename tests/expected/{ts-md5 => md5/md5} (100%)
 rename tests/{input/ts-md5 => ts/md5/data} (100%)
 rename tests/{ts-md5 => ts/md5/md5} (71%)

diff --git a/tests/expected/ts-md5 b/tests/expected/md5/md5
similarity index 100%
rename from tests/expected/ts-md5
rename to tests/expected/md5/md5
diff --git a/tests/input/ts-md5 b/tests/ts/md5/data
similarity index 100%
rename from tests/input/ts-md5
rename to tests/ts/md5/data
diff --git a/tests/ts-md5 b/tests/ts/md5/md5
similarity index 71%
rename from tests/ts-md5
rename to tests/ts/md5/md5
index 6c04c9cb6..eda6d0497 100755
--- a/tests/ts-md5
+++ b/tests/ts/md5/md5
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# Copyright (C) 2007 Karel Zak <kzak@redhat.com>
+# Copyright (C) 2009 Karel Zak <kzak@redhat.com>
 #
 # This file is part of util-linux-ng.
 #
@@ -15,21 +15,16 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
-. ./commands.sh
-. ./functions.sh
-
-TS_COMPONENT="md5"
-TS_DESC=""
+TS_TOPDIR="$(dirname $0)/../.."
 
+. $TS_TOPDIR/functions.sh
 ts_init "$*"
+
 > $TS_OUTPUT
 
-MY_MD5_UTIL="$TS_HELPER_MD5"
-#MY_MD5_UTIL="md5sum"
-
-cat $TS_INPUT | while read data
+cat $TS_SELF/data | while read data
 do
-	echo -n $data | $MY_MD5_UTIL >> $TS_OUTPUT
+	echo -n $data | $TS_HELPER_MD5 >> $TS_OUTPUT
 done
 
 ts_finalize