tests: cleanup lscpu reg.tests

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

tests/ts-lscpu-i386-amdshanghai

@@ -1,3 +0,0 @@
-#!/bin/bash
-export TS_DESC="i386-amdshanghai"
-. ./ts-lscpu.sh

tests/ts-lscpu-i386-dellpe700

@@ -1,3 +0,0 @@
-#!/bin/bash
-export TS_DESC=i386-dellpe700
-. ./ts-lscpu.sh

tests/ts-lscpu-i386-intels5000phb

@@ -1,3 +0,0 @@
-#!/bin/bash
-export TS_DESC=i386-intels5000phb
-. ./ts-lscpu.sh

tests/ts-lscpu-i386-xenpara

@@ -1,3 +0,0 @@
-#!/bin/bash
-export TS_DESC=i386-xenpara
-. ./ts-lscpu.sh

tests/ts-lscpu-ia64-hpmatterhorn

@@ -1,3 +0,0 @@
-#!/bin/bash
-export TS_DESC=ia64-hpmatterhorn
-. ./ts-lscpu.sh

tests/ts-lscpu-ia64-hprx1620

@@ -1,3 +0,0 @@
-#!/bin/bash
-export TS_DESC=ia64-hprx1620
-. ./ts-lscpu.sh

tests/ts-lscpu-ia64-pg0

@@ -1,3 +0,0 @@
-#!/bin/bash
-export TS_DESC=ia64-pg0
-. ./ts-lscpu.sh

tests/ts-lscpu-x86_64-hpdl585

@@ -1,3 +0,0 @@
-#!/bin/bash
-TS_DESC=x86_64-hpdl585
-. ./ts-lscpu.sh

tests/ts-lscpu-x86_64-ibme326m

@@ -1,3 +0,0 @@
-#!/bin/bash
-export TS_DESC=x86_64-ibme326m
-. ./ts-lscpu.sh

tests/ts-lscpu-x86_64-necem14

@@ -1,3 +0,0 @@
-#!/bin/bash
-export TS_DESC=x86_64-necem14
-. ./ts-lscpu.sh

tests/ts-lscpu-x86_64-xenfull

@@ -1,3 +0,0 @@
-#!/bin/bash
-TS_DESC=x86_64-xenfull
-. ./ts-lscpu.sh

tests/ts/lscpu/lscpu

@@ -1,3 +1,4 @@
+#!/bin/bash
 #
 # Copyright (C) 2008 Cai Qian <qcai@redhat.com>
 #
@@ -16,19 +17,25 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-. ./commands.sh
-. ./functions.sh
-
-TS_COMPONENT="lscpu"
+TS_TOPDIR="$(dirname $0)/../.."
+. $TS_TOPDIR/functions.sh
 
 ts_init "$*"
 
-# Architecture information is not applicable with -s.
-"${TS_CMD_LSCPU}" -s "${TS_INPUT}" | grep -v "Architecture" \
- >"${TS_OUTPUT}" 2>&1
+for name in $(ls $TS_SELF/proc-dumps/ | sort); do
+	path=$TS_SELF/proc-dumps/$name
+	ts_init_subtest $name
 
-echo >>"${TS_OUTPUT}"
+	# Architecture information is not applicable with -s.
+	"${TS_CMD_LSCPU}" -s "${path}" | grep -v "Architecture" \
+	 >"${TS_OUTPUT}" 2>&1
 
-"${TS_CMD_LSCPU}" -p -s "${TS_INPUT}" >>"${TS_OUTPUT}" 2>&1
+	echo >>"${TS_OUTPUT}"
+
+	"${TS_CMD_LSCPU}" -p -s "${path}" >>"${TS_OUTPUT}" 2>&1
+
+	ts_finalize_subtest
+done
 
 ts_finalize
+