r757 - trunk
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-01-31 21:11:32 +0000 (Mon, 31 Jan 2011)
New Revision: 757
Modified:
trunk/Makefile
Log:
R10
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2011-01-28 17:07:15 UTC (rev 756)
+++ trunk/Makefile 2011-01-31 21:11:32 UTC (rev 757)
@@ -14,7 +14,7 @@
# Author: Greg Nichols
V7_VERSION := 1.3
-V7_RELEASE := 9
+V7_RELEASE := 10
V7_VERSION_RELEASE := $(V7_VERSION)-$(V7_RELEASE)
V7_VERSION_PY := v7/version.py
V7_SVN_MODULE := svn+ssh://svn.fedorahosted.org/svn/v7
13 years, 3 months
r756 - in tags: . v7-V1-3R9/v7
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-01-28 17:07:15 +0000 (Fri, 28 Jan 2011)
New Revision: 756
Added:
tags/v7-V1-3R9/
tags/v7-V1-3R9/v7/version.py
Log:
tag version
Copied: tags/v7-V1-3R9/v7/version.py (from rev 335, trunk/v7/version.py)
===================================================================
--- tags/v7-V1-3R9/v7/version.py (rev 0)
+++ tags/v7-V1-3R9/v7/version.py 2011-01-28 17:07:15 UTC (rev 756)
@@ -0,0 +1,5 @@
+
+# v7/version.py is automatically-generated - DO NOT EDIT
+version = '1.3'
+release = '9'
+rhel_version = '6'
13 years, 3 months
r755 - trunk
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-01-28 17:05:51 +0000 (Fri, 28 Jan 2011)
New Revision: 755
Modified:
trunk/v7.spec.in
Log:
changelog
Modified: trunk/v7.spec.in
===================================================================
--- trunk/v7.spec.in 2011-01-28 17:04:45 UTC (rev 754)
+++ trunk/v7.spec.in 2011-01-28 17:05:51 UTC (rev 755)
@@ -71,7 +71,7 @@
%changelog
* Fri Jan 28 2011 Greg Nichols <gnichols(a)redhat.com>
-V7 1.3 R8
+V7 1.3 R9
589739 - CPUSCALING test includes unprocessed tags around displayed text
13 years, 3 months
r754 - trunk
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-01-28 17:04:45 +0000 (Fri, 28 Jan 2011)
New Revision: 754
Modified:
trunk/Makefile
Log:
R9
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2011-01-28 17:00:35 UTC (rev 753)
+++ trunk/Makefile 2011-01-28 17:04:45 UTC (rev 754)
@@ -14,7 +14,7 @@
# Author: Greg Nichols
V7_VERSION := 1.3
-V7_RELEASE := 8
+V7_RELEASE := 9
V7_VERSION_RELEASE := $(V7_VERSION)-$(V7_RELEASE)
V7_VERSION_PY := v7/version.py
V7_SVN_MODULE := svn+ssh://svn.fedorahosted.org/svn/v7
13 years, 3 months
r753 - trunk/test-env/lib
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-01-28 17:00:35 +0000 (Fri, 28 Jan 2011)
New Revision: 753
Modified:
trunk/test-env/lib/v7-make.include
Log:
589739 - CPUSCALING test includes unprocessed tags around displayed text
Modified: trunk/test-env/lib/v7-make.include
===================================================================
--- trunk/test-env/lib/v7-make.include 2011-01-28 15:04:42 UTC (rev 752)
+++ trunk/test-env/lib/v7-make.include 2011-01-28 17:00:35 UTC (rev 753)
@@ -14,7 +14,7 @@
# Author: Greg Nichols <gnichols(a)redhat.com>
#
-# hts-make.include
+# v7-make.include
#
# default rules and settings for hts makefiles adapted to run RHTS tests in the
# hardware certification test suite.
@@ -23,13 +23,11 @@
# Common Variables.
TEST_DIR=/mnt/tests$(TEST)
INSTALL_DIR=$(DEST)$(TEST_DIR)
-METADATA=testinfo.desc
# tag, release, prep, package, submit: Not relevant to HTS
-install: $(FILES) runtest.sh testinfo.desc
+install: $(FILES)
mkdir -p $(INSTALL_DIR)
cp -a $(FILES) Makefile $(INSTALL_DIR)
- install -m 0755 runtest.sh $(INSTALL_DIR)
13 years, 3 months
r752 - in tags: . v7-V1-3R8/v7
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-01-28 15:04:42 +0000 (Fri, 28 Jan 2011)
New Revision: 752
Added:
tags/v7-V1-3R8/
tags/v7-V1-3R8/v7/version.py
Log:
tag version
Copied: tags/v7-V1-3R8/v7/version.py (from rev 335, trunk/v7/version.py)
===================================================================
--- tags/v7-V1-3R8/v7/version.py (rev 0)
+++ tags/v7-V1-3R8/v7/version.py 2011-01-28 15:04:42 UTC (rev 752)
@@ -0,0 +1,5 @@
+
+# v7/version.py is automatically-generated - DO NOT EDIT
+version = '1.3'
+release = '8'
+rhel_version = '6'
13 years, 3 months
r751 - trunk
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-01-28 15:03:51 +0000 (Fri, 28 Jan 2011)
New Revision: 751
Modified:
trunk/v7.spec.in
Log:
changelog
Modified: trunk/v7.spec.in
===================================================================
--- trunk/v7.spec.in 2011-01-28 15:02:35 UTC (rev 750)
+++ trunk/v7.spec.in 2011-01-28 15:03:51 UTC (rev 751)
@@ -69,6 +69,12 @@
/etc/init.d/v7
%changelog
+* Fri Jan 28 2011 Greg Nichols <gnichols(a)redhat.com>
+
+V7 1.3 R8
+
+ 589739 - CPUSCALING test includes unprocessed tags around displayed text
+
* Thu Jan 27 2011 Greg Nichols <gnichols(a)redhat.com>
V7 1.3 R7
@@ -76,8 +82,7 @@
627043 - HWCert: RedHat v7-1.2-16 network test on sit0 interface fails
623787 - core test - stress portion should scale for memory size
607976 - sosreport: error: no such option: --no-progressbar
- 589739 - CPUSCALING test includes unprocessed tags around displayed text
-
+
* Thu Jan 20 2011 Greg Nichols <gnichols(a)redhat.com>
V7 1.3 R6
13 years, 3 months
r750 - trunk/v7
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-01-28 15:02:35 +0000 (Fri, 28 Jan 2011)
New Revision: 750
Modified:
trunk/v7/log.py
Log:
589739 - CPUSCALING test includes unprocessed tags around displayed text
Modified: trunk/v7/log.py
===================================================================
--- trunk/v7/log.py 2011-01-28 15:00:30 UTC (rev 749)
+++ trunk/v7/log.py 2011-01-28 15:02:35 UTC (rev 750)
@@ -50,7 +50,7 @@
log.close()
logfile = open("qq.txt", "r")
lines = logfile.readlines()
- if lines[0] == "this should go to both console and log\n":
+ if lines[1] == "this should go to both console and log\n":
return True
else:
return False
13 years, 3 months
r749 - in trunk/tests: audio battery bluray cdrom core cpuscaling dvd expresscard fencing floppy fv_core fv_memory fv_network fv_storage hwlatdetect info lid memory network pccard profiler reboot rteval storage suspend tape usb video wlan
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-01-28 15:00:30 +0000 (Fri, 28 Jan 2011)
New Revision: 749
Modified:
trunk/tests/audio/Makefile
trunk/tests/battery/Makefile
trunk/tests/bluray/Makefile
trunk/tests/cdrom/Makefile
trunk/tests/core/Makefile
trunk/tests/cpuscaling/Makefile
trunk/tests/dvd/Makefile
trunk/tests/expresscard/Makefile
trunk/tests/fencing/Makefile
trunk/tests/floppy/Makefile
trunk/tests/fv_core/Makefile
trunk/tests/fv_memory/Makefile
trunk/tests/fv_network/Makefile
trunk/tests/fv_storage/Makefile
trunk/tests/hwlatdetect/Makefile
trunk/tests/info/Makefile
trunk/tests/lid/Makefile
trunk/tests/memory/Makefile
trunk/tests/network/Makefile
trunk/tests/pccard/Makefile
trunk/tests/pccard/pccard.py
trunk/tests/profiler/Makefile
trunk/tests/reboot/Makefile
trunk/tests/rteval/Makefile
trunk/tests/storage/Makefile
trunk/tests/suspend/Makefile
trunk/tests/tape/Makefile
trunk/tests/usb/Makefile
trunk/tests/video/Makefile
trunk/tests/wlan/Makefile
Log:
589739 - CPUSCALING test includes unprocessed tags around displayed text
Modified: trunk/tests/audio/Makefile
===================================================================
--- trunk/tests/audio/Makefile 2011-01-27 19:42:45 UTC (rev 748)
+++ trunk/tests/audio/Makefile 2011-01-28 15:00:30 UTC (rev 749)
@@ -16,7 +16,7 @@
.PHONY: all install download clean
BUILT_FILES=
-FILES=$(METADATA) runtest.sh audio.py
+FILES=runtest.sh audio.py
run: $(FILES) build
./runtest.sh
@@ -25,26 +25,12 @@
chmod a+x ./runtest.sh audio.py
clean:
- rm -f $(BUILT_FILES) $(METADATA)
+ rm -f $(BUILT_FILES)
# Include Common Makefile
include $(DESTDIR)/usr/share/v7/lib/v7-make.include
-# Generate the testinfo.desc here:
-$(METADATA): Makefile
- @touch $(METADATA)
- @echo "Owner: Greg Nichols <gnichols(a)redhat.com>" > $(METADATA)
- @echo "Name: $(TEST)" >> $(METADATA)
- @echo "Path: $(TEST_DIR)" >> $(METADATA)
- @echo "TestVersion: $(TESTVERSION)" >> $(METADATA)
- @echo "Description: Hardware Certification test for audio devices ">> $(METADATA)
- @echo "TestTime: 1m" >> $(METADATA)
- @echo "RunFor: $(PACKAGE_NAME)" >> $(METADATA)
- @echo "Requires: $(PACKAGE_NAME)" >> $(METADATA)
- @echo "X-RunForDevice: linux.device_file == '/dev/audio'" >> $(METADATA)
- @echo "X-Interactive: yes" >> $(METADATA)
- @echo "X-Priority: 1" >> $(METADATA)
Modified: trunk/tests/battery/Makefile
===================================================================
--- trunk/tests/battery/Makefile 2011-01-27 19:42:45 UTC (rev 748)
+++ trunk/tests/battery/Makefile 2011-01-28 15:00:30 UTC (rev 749)
@@ -15,7 +15,7 @@
.PHONY: all install download clean
-FILES=$(METADATA) runtest.sh battery.py
+FILES=runtest.sh battery.py
run: $(FILES) build
./runtest.sh
@@ -29,18 +29,5 @@
# Include Common Makefile
include $(DESTDIR)/usr/share/v7/lib/v7-make.include
-# Generate the testinfo.desc here:
-$(METADATA): Makefile
- @touch $(METADATA)
- @echo "Owner: Greg Nichols <gnichols(a)redhat.com>" > $(METADATA)
- @echo "Name: $(TEST)" >> $(METADATA)
- @echo "Path: $(TEST_DIR)" >> $(METADATA)
- @echo "TestVersion: $(TESTVERSION)" >> $(METADATA)
- @echo "Description: Hardware Certification Battery Test">> $(METADATA)
- @echo "TestTime: 10m" >> $(METADATA)
- @echo "RunFor: $(PACKAGE_NAME)" >> $(METADATA)
- @echo "Requires: $(PACKAGE_NAME)" >> $(METADATA)
- @echo "X-RunForDevice: 'battery' in info.category" >> $(METADATA)
- @echo "X-Interactive: yes" >> $(METADATA)
Modified: trunk/tests/bluray/Makefile
===================================================================
--- trunk/tests/bluray/Makefile 2011-01-27 19:42:45 UTC (rev 748)
+++ trunk/tests/bluray/Makefile 2011-01-28 15:00:30 UTC (rev 749)
@@ -15,7 +15,7 @@
.PHONY: all install download clean
-FILES=$(METADATA) runtest.sh bluray.py
+FILES=runtest.sh bluray.py
run: $(FILES) build
./runtest.sh
@@ -24,23 +24,9 @@
chmod a+x ./runtest.sh ./bluray.py
clean:
- rm -f $(BUILT_FILES) $(METADATA)
+ rm -f $(BUILT_FILES)
# Include Common Makefile
include $(DESTDIR)/usr/share/v7/lib/v7-make.include
-# Generate the testinfo.desc here:
-$(METADATA): Makefile
- @touch $(METADATA)
- @echo "Owner: YangKun <ykun(a)redhat.com>" > $(METADATA)
- @echo "Name: $(TEST)" >> $(METADATA)
- @echo "Path: $(TEST_DIR)" >> $(METADATA)
- @echo "TestVersion: $(TESTVERSION)" >> $(METADATA)
- @echo "Description: HW Cert bluray test ">> $(METADATA)
- @echo "TestTime: 4h" >> $(METADATA)
- @echo "RunFor: $(PACKAGE_NAME)" >> $(METADATA)
- @echo "Requires: $(PACKAGE_NAME)" >> $(METADATA)
- @echo "X-RunForDevice: storage.cdrom.bd == 'true' " >> $(METADATA)
- @echo "X-Interactive: yes" >> $(METADATA)
- @echo "X-Priority: 1" >> $(METADATA)
Modified: trunk/tests/cdrom/Makefile
===================================================================
--- trunk/tests/cdrom/Makefile 2011-01-27 19:42:45 UTC (rev 748)
+++ trunk/tests/cdrom/Makefile 2011-01-28 15:00:30 UTC (rev 749)
@@ -15,7 +15,7 @@
.PHONY: all install download clean
-FILES=$(METADATA) runtest.sh cdrom.py
+FILES=runtest.sh cdrom.py
run: $(FILES) build
./runtest.sh
@@ -24,23 +24,10 @@
chmod a+x ./runtest.sh ./cdrom.py
clean:
- rm -f $(BUILT_FILES) $(METADATA)
+ rm -f $(BUILT_FILES)
# Include Common Makefile
include $(DESTDIR)/usr/share/v7/lib/v7-make.include
-# Generate the testinfo.desc here:
-$(METADATA): Makefile
- @touch $(METADATA)
- @echo "Owner: YangKun <ykun(a)redhat.com>" > $(METADATA)
- @echo "Name: $(TEST)" >> $(METADATA)
- @echo "Path: $(TEST_DIR)" >> $(METADATA)
- @echo "TestVersion: $(TESTVERSION)" >> $(METADATA)
- @echo "Description: HW Cert cdrom test ">> $(METADATA)
- @echo "TestTime: 4h" >> $(METADATA)
- @echo "RunFor: $(PACKAGE_NAME)" >> $(METADATA)
- @echo "Requires: $(PACKAGE_NAME)" >> $(METADATA)
- @echo "X-RunForDevice: 'storage.cdrom' in info.capabilities " >> $(METADATA)
- @echo "X-Interactive: yes" >> $(METADATA)
- @echo "X-Priority: 1" >> $(METADATA)
+
Modified: trunk/tests/core/Makefile
===================================================================
--- trunk/tests/core/Makefile 2011-01-27 19:42:45 UTC (rev 748)
+++ trunk/tests/core/Makefile 2011-01-28 15:00:30 UTC (rev 749)
@@ -16,7 +16,7 @@
.PHONY: all install download clean
BUILT_FILES= clocktest
-FILES=$(METADATA) runtest.sh clocktest.c CORE2 core.py
+FILES=runtest.sh clocktest.c CORE2 core.py
run: $(FILES) build
./runtest.sh
@@ -25,7 +25,7 @@
chmod a+x ./runtest.sh ./CORE2 ./core.py
clean:
- rm -f $(BUILT_FILES) $(METADATA)
+ rm -f $(BUILT_FILES)
CFLAGS+=-Wall
@@ -40,19 +40,6 @@
# Include Common Makefile
include $(DESTDIR)/usr/share/v7/lib/v7-make.include
-# Generate the testinfo.desc here:
-$(METADATA): Makefile
- @touch $(METADATA)
- @echo "Owner: Greg Nichols <gnichols(a)redhat.com>" > $(METADATA)
- @echo "Name: $(TEST)" >> $(METADATA)
- @echo "Path: $(TEST_DIR)" >> $(METADATA)
- @echo "TestVersion: $(TESTVERSION)" >> $(METADATA)
- @echo "Description: HW Cert Clock Test ">> $(METADATA)
- @echo "TestTime: 5m" >> $(METADATA)
- @echo "RunFor: $(PACKAGE_NAME)" >> $(METADATA)
- @echo "Requires: $(PACKAGE_NAME)" >> $(METADATA)
- @echo "X-RunForDevice: info.product == 'Computer' " >> $(METADATA)
- @echo "X-HardwareClass: CPU" >> $(METADATA)
Modified: trunk/tests/cpuscaling/Makefile
===================================================================
--- trunk/tests/cpuscaling/Makefile 2011-01-27 19:42:45 UTC (rev 748)
+++ trunk/tests/cpuscaling/Makefile 2011-01-28 15:00:30 UTC (rev 749)
@@ -15,7 +15,7 @@
.PHONY: all install download clean
-FILES=$(METADATA) runtest.sh cpuscaling.py
+FILES=runtest.sh cpuscaling.py
run: $(FILES) build
./runtest.sh
@@ -24,21 +24,8 @@
chmod a+x ./runtest.sh ./cpuscaling.py
clean:
- rm -f $(BUILT_FILES) $(METADATA)
+ rm -f $(BUILT_FILES)
# Include Common Makefile
include $(DESTDIR)/usr/share/v7/lib/v7-make.include
-# Generate the testinfo.desc here:
-$(METADATA): Makefile
- @touch $(METADATA)
- @echo "Owner: Greg Nichols <gnichols(a)redhat.com>" > $(METADATA)
- @echo "Name: $(TEST)" >> $(METADATA)
- @echo "Path: $(TEST_DIR)" >> $(METADATA)
- @echo "TestVersion: $(TESTVERSION)" >> $(METADATA)
- @echo "Description: HW Cert CPU Frequency Scaling test ">> $(METADATA)
- @echo "TestTime: 5m" >> $(METADATA)
- @echo "RunFor: $(PACKAGE_NAME)" >> $(METADATA)
- @echo "Requires: $(PACKAGE_NAME)" >> $(METADATA)
- @echo "X-RunForDevice: info.product == 'Computer' " >> $(METADATA)
- @echo "X-Interactive: no" >> $(METADATA)
Modified: trunk/tests/dvd/Makefile
===================================================================
--- trunk/tests/dvd/Makefile 2011-01-27 19:42:45 UTC (rev 748)
+++ trunk/tests/dvd/Makefile 2011-01-28 15:00:30 UTC (rev 749)
@@ -15,7 +15,7 @@
.PHONY: all install download clean
-FILES=$(METADATA) runtest.sh dvd.py
+FILES=runtest.sh dvd.py
run: $(FILES) build
./runtest.sh
@@ -24,23 +24,9 @@
chmod a+x ./runtest.sh ./dvd.py
clean:
- rm -f $(BUILT_FILES) $(METADATA)
+ rm -f $(BUILT_FILES)
# Include Common Makefile
include $(DESTDIR)/usr/share/v7/lib/v7-make.include
-# Generate the testinfo.desc here:
-$(METADATA): Makefile
- @touch $(METADATA)
- @echo "Owner: YangKun <ykun(a)redhat.com>" > $(METADATA)
- @echo "Name: $(TEST)" >> $(METADATA)
- @echo "Path: $(TEST_DIR)" >> $(METADATA)
- @echo "TestVersion: $(TESTVERSION)" >> $(METADATA)
- @echo "Description: HW Cert cdrom test ">> $(METADATA)
- @echo "TestTime: 4h" >> $(METADATA)
- @echo "RunFor: $(PACKAGE_NAME)" >> $(METADATA)
- @echo "Requires: $(PACKAGE_NAME)" >> $(METADATA)
- @echo "X-RunForDevice: 'storage.cdrom' in info.capabilities " >> $(METADATA)
- @echo "X-Interactive: yes" >> $(METADATA)
- @echo "X-Priority: 1" >> $(METADATA)
Modified: trunk/tests/expresscard/Makefile
===================================================================
--- trunk/tests/expresscard/Makefile 2011-01-27 19:42:45 UTC (rev 748)
+++ trunk/tests/expresscard/Makefile 2011-01-28 15:00:30 UTC (rev 749)
@@ -24,21 +24,8 @@
chmod a+x ./runtest.sh ./expresscard.py
clean:
- rm -f $(BUILT_FILES) $(METADATA)
+ rm -f $(BUILT_FILES)
# Include Common Makefile
include $(DESTDIR)/usr/share/v7/lib/v7-make.include
-# Generate the testinfo.desc here:
-$(METADATA): Makefile
- @touch $(METADATA)
- @echo "Owner: YangKun <ykun(a)redhat.com>" > $(METADATA)
- @echo "Name: $(TEST)" >> $(METADATA)
- @echo "Path: $(TEST_DIR)" >> $(METADATA)
- @echo "TestVersion: $(TESTVERSION)" >> $(METADATA)
- @echo "Description: HW Cert ExpressCard test ">> $(METADATA)
- @echo "TestTime: 5m" >> $(METADATA)
- @echo "RunFor: $(PACKAGE_NAME)" >> $(METADATA)
- @echo "Requires: $(PACKAGE_NAME)" >> $(METADATA)
- @echo "X-RunForDevice: info.product == 'Computer' " >> $(METADATA)
- @echo "X-Interactive: yes" >> $(METADATA)
Modified: trunk/tests/fencing/Makefile
===================================================================
--- trunk/tests/fencing/Makefile 2011-01-27 19:42:45 UTC (rev 748)
+++ trunk/tests/fencing/Makefile 2011-01-28 15:00:30 UTC (rev 749)
@@ -15,7 +15,7 @@
.PHONY: all install download clean
-FILES=$(METADATA) runtest.sh fencing.py agent.py
+FILES=runtest.sh fencing.py agent.py
run: $(FILES) build
./runtest.sh
@@ -24,21 +24,8 @@
chmod a+x ./runtest.sh ./fencing.py
clean:
- rm -f $(BUILT_FILES) $(METADATA)
+ rm -f $(BUILT_FILES)
# Include Common Makefile
include $(DESTDIR)/usr/share/v7/lib/v7-make.include
-# Generate the testinfo.desc here:
-$(METADATA): Makefile
- @touch $(METADATA)
- @echo "Owner: Greg Nichols <gnichols(a)redhat.com>" > $(METADATA)
- @echo "Name: $(TEST)" >> $(METADATA)
- @echo "Path: $(TEST_DIR)" >> $(METADATA)
- @echo "TestVersion: $(TESTVERSION)" >> $(METADATA)
- @echo "Description: HW Cert Fencing test ">> $(METADATA)
- @echo "TestTime: 5m" >> $(METADATA)
- @echo "RunFor: $(PACKAGE_NAME)" >> $(METADATA)
- @echo "Requires: $(PACKAGE_NAME)" >> $(METADATA)
- @echo "X-RunForDevice: info.product == 'Computer' " >> $(METADATA)
- @echo "X-Interactive: yes" >> $(METADATA)
Modified: trunk/tests/floppy/Makefile
===================================================================
--- trunk/tests/floppy/Makefile 2011-01-27 19:42:45 UTC (rev 748)
+++ trunk/tests/floppy/Makefile 2011-01-28 15:00:30 UTC (rev 749)
@@ -15,7 +15,7 @@
.PHONY: all install download clean
-FILES=$(METADATA) runtest.sh floppy.py
+FILES=runtest.sh floppy.py
run: $(FILES) build
./runtest.sh
@@ -24,24 +24,10 @@
chmod a+x ./runtest.sh ./floppy.py
clean:
- rm -f $(BUILT_FILES) $(METADATA)
+ rm -f $(BUILT_FILES)
# Include Common Makefile
include $(DESTDIR)/usr/share/v7/lib/v7-make.include
-# Generate the testinfo.desc here:
-$(METADATA): Makefile
- @touch $(METADATA)
- @echo "Owner: YangKun <ykun(a)redhat.com>" > $(METADATA)
- @echo "Name: $(TEST)" >> $(METADATA)
- @echo "Path: $(TEST_DIR)" >> $(METADATA)
- @echo "TestVersion: $(TESTVERSION)" >> $(METADATA)
- @echo "Description: HW Cert Floppy test ">> $(METADATA)
- @echo "TestTime: 5m" >> $(METADATA)
- @echo "RunFor: $(PACKAGE_NAME)" >> $(METADATA)
- @echo "Requires: $(PACKAGE_NAME)" >> $(METADATA)
- @echo "X-RunForDevice: 'floppy' == platform.id or 'floppy' == storage.drive_type" >> $(METADATA)
- @echo "X-Interactive: yes" >> $(METADATA)
- @echo "X-Priority: 1" >> $(METADATA)
- @echo "X-DeviceClass: FLOPPY" >> $(METADATA)
+
Modified: trunk/tests/fv_core/Makefile
===================================================================
--- trunk/tests/fv_core/Makefile 2011-01-27 19:42:45 UTC (rev 748)
+++ trunk/tests/fv_core/Makefile 2011-01-28 15:00:30 UTC (rev 749)
@@ -15,7 +15,7 @@
.PHONY: all install download clean
-FILES=$(METADATA) runtest.sh fv_core.py
+FILES=runtest.sh fv_core.py
run: $(FILES) build
./runtest.sh
@@ -24,22 +24,10 @@
chmod a+x ./runtest.sh ./fv_core.py
clean:
- rm -f $(BUILT_FILES) $(METADATA)
+ rm -f $(BUILT_FILES)
# Include Common Makefile
include $(DESTDIR)/usr/share/v7/lib/v7-make.include
-# Generate the testinfo.desc here:
-$(METADATA): Makefile
- @touch $(METADATA)
- @echo "Owner: YangKun <ykun(a)redhat.com>" > $(METADATA)
- @echo "Name: $(TEST)" >> $(METADATA)
- @echo "Path: $(TEST_DIR)" >> $(METADATA)
- @echo "TestVersion: $(TESTVERSION)" >> $(METADATA)
- @echo "Description: HW Cert FV_CORE test ">> $(METADATA)
- @echo "TestTime: 1h" >> $(METADATA)
- @echo "RunFor: $(PACKAGE_NAME)" >> $(METADATA)
- @echo "Requires: $(PACKAGE_NAME)" >> $(METADATA)
- @echo "X-RunForDevice: info.product == 'Computer' " >> $(METADATA)
- @echo "X-Interactive: no" >> $(METADATA)
+
Modified: trunk/tests/fv_memory/Makefile
===================================================================
--- trunk/tests/fv_memory/Makefile 2011-01-27 19:42:45 UTC (rev 748)
+++ trunk/tests/fv_memory/Makefile 2011-01-28 15:00:30 UTC (rev 749)
@@ -15,7 +15,7 @@
.PHONY: all install download clean
-FILES=$(METADATA) runtest.sh fv_memory.py
+FILES=runtest.sh fv_memory.py
run: $(FILES) build
./runtest.sh
@@ -24,22 +24,9 @@
chmod a+x ./runtest.sh ./fv_memory.py
clean:
- rm -f $(BUILT_FILES) $(METADATA)
+ rm -f $(BUILT_FILES)
# Include Common Makefile
include $(DESTDIR)/usr/share/v7/lib/v7-make.include
-# Generate the testinfo.desc here:
-$(METADATA): Makefile
- @touch $(METADATA)
- @echo "Owner: YangKun <ykun(a)redhat.com>" > $(METADATA)
- @echo "Name: $(TEST)" >> $(METADATA)
- @echo "Path: $(TEST_DIR)" >> $(METADATA)
- @echo "TestVersion: $(TESTVERSION)" >> $(METADATA)
- @echo "Description: HW Cert FV_MEMORY test ">> $(METADATA)
- @echo "TestTime: 1h" >> $(METADATA)
- @echo "RunFor: $(PACKAGE_NAME)" >> $(METADATA)
- @echo "Requires: $(PACKAGE_NAME)" >> $(METADATA)
- @echo "X-RunForDevice: info.product == 'Computer' " >> $(METADATA)
- @echo "X-Interactive: no" >> $(METADATA)
Modified: trunk/tests/fv_network/Makefile
===================================================================
--- trunk/tests/fv_network/Makefile 2011-01-27 19:42:45 UTC (rev 748)
+++ trunk/tests/fv_network/Makefile 2011-01-28 15:00:30 UTC (rev 749)
@@ -15,7 +15,7 @@
.PHONY: all install download clean
-FILES=$(METADATA) runtest.sh fv_network.py
+FILES=runtest.sh fv_network.py
run: $(FILES) build
./runtest.sh
@@ -24,22 +24,10 @@
chmod a+x ./runtest.sh ./fv_network.py
clean:
- rm -f $(BUILT_FILES) $(METADATA)
+ rm -f $(BUILT_FILES)
# Include Common Makefile
include $(DESTDIR)/usr/share/v7/lib/v7-make.include
-# Generate the testinfo.desc here:
-$(METADATA): Makefile
- @touch $(METADATA)
- @echo "Owner: YangKun <ykun(a)redhat.com>" > $(METADATA)
- @echo "Name: $(TEST)" >> $(METADATA)
- @echo "Path: $(TEST_DIR)" >> $(METADATA)
- @echo "TestVersion: $(TESTVERSION)" >> $(METADATA)
- @echo "Description: HW Cert FV_NETWORK test ">> $(METADATA)
- @echo "TestTime: 1h" >> $(METADATA)
- @echo "RunFor: $(PACKAGE_NAME)" >> $(METADATA)
- @echo "Requires: $(PACKAGE_NAME)" >> $(METADATA)
- @echo "X-RunForDevice: info.product == 'Computer' " >> $(METADATA)
- @echo "X-Interactive: no" >> $(METADATA)
+
Modified: trunk/tests/fv_storage/Makefile
===================================================================
--- trunk/tests/fv_storage/Makefile 2011-01-27 19:42:45 UTC (rev 748)
+++ trunk/tests/fv_storage/Makefile 2011-01-28 15:00:30 UTC (rev 749)
@@ -15,7 +15,7 @@
.PHONY: all install download clean
-FILES=$(METADATA) runtest.sh fv_storage.py
+FILES=runtest.sh fv_storage.py
run: $(FILES) build
./runtest.sh
@@ -24,22 +24,10 @@
chmod a+x ./runtest.sh ./fv_storage.py
clean:
- rm -f $(BUILT_FILES) $(METADATA)
+ rm -f $(BUILT_FILES)
# Include Common Makefile
include $(DESTDIR)/usr/share/v7/lib/v7-make.include
-# Generate the testinfo.desc here:
-$(METADATA): Makefile
- @touch $(METADATA)
- @echo "Owner: YangKun <ykun(a)redhat.com>" > $(METADATA)
- @echo "Name: $(TEST)" >> $(METADATA)
- @echo "Path: $(TEST_DIR)" >> $(METADATA)
- @echo "TestVersion: $(TESTVERSION)" >> $(METADATA)
- @echo "Description: HW Cert FV_STORAGE test ">> $(METADATA)
- @echo "TestTime: 1h" >> $(METADATA)
- @echo "RunFor: $(PACKAGE_NAME)" >> $(METADATA)
- @echo "Requires: $(PACKAGE_NAME)" >> $(METADATA)
- @echo "X-RunForDevice: info.product == 'Computer' " >> $(METADATA)
- @echo "X-Interactive: no" >> $(METADATA)
+
Modified: trunk/tests/hwlatdetect/Makefile
===================================================================
--- trunk/tests/hwlatdetect/Makefile 2011-01-27 19:42:45 UTC (rev 748)
+++ trunk/tests/hwlatdetect/Makefile 2011-01-28 15:00:30 UTC (rev 749)
@@ -15,7 +15,7 @@
.PHONY: all install download clean
-FILES=$(METADATA) runtest.sh v7_hwlatdetect.py
+FILES=runtest.sh v7_hwlatdetect.py
run: $(FILES) build
./runtest.sh
@@ -29,17 +29,4 @@
# Include Common Makefile
include $(DESTDIR)/usr/share/v7/lib/v7-make.include
-# Generate the testinfo.desc here:
-$(METADATA): Makefile
- @touch $(METADATA)
- @echo "Owner: Clark Williams <williams(a)redhat.com>" > $(METADATA)
- @echo "Name: $(TEST)" >> $(METADATA)
- @echo "Path: $(TEST_DIR)" >> $(METADATA)
- @echo "TestVersion: $(TESTVERSION)" >> $(METADATA)
- @echo "Description: Hardware Certification Hardware Latency Detection Test">> $(METADATA)
- @echo "TestTime: 1h" >> $(METADATA)
- @echo "RunFor: $(PACKAGE_NAME)" >> $(METADATA)
- @echo "Requires: $(PACKAGE_NAME)" >> $(METADATA)
- @echo "X-Interactive: no" >> $(METADATA)
-
Modified: trunk/tests/info/Makefile
===================================================================
--- trunk/tests/info/Makefile 2011-01-27 19:42:45 UTC (rev 748)
+++ trunk/tests/info/Makefile 2011-01-28 15:00:30 UTC (rev 749)
@@ -16,7 +16,7 @@
.PHONY: all install download clean
BUILT_FILES=
-FILES=$(METADATA) runtest.sh info.py
+FILES=runtest.sh info.py
run: $(FILES) build
./runtest.sh
@@ -25,27 +25,15 @@
chmod a+x ./runtest.sh ./info.py
clean:
- rm -f $(BUILT_FILES) $(METADATA)
+ rm -f $(BUILT_FILES)
# Include Common Makefile
include $(DESTDIR)/usr/share/v7/lib/v7-make.include
-# Generate the testinfo.desc here:
-$(METADATA): Makefile
- @touch $(METADATA)
- @echo "Owner: Greg Nichols <gnichols(a)redhat.com>" > $(METADATA)
- @echo "Name: $(TEST)" >> $(METADATA)
- @echo "Path: $(TEST_DIR)" >> $(METADATA)
- @echo "TestVersion: $(TESTVERSION)" >> $(METADATA)
- @echo "Description: Hardware Certification, test to gather system information. ">> $(METADATA)
- @echo "TestTime: 5m" >> $(METADATA)
- @echo "RunFor: $(PACKAGE_NAME)" >> $(METADATA)
- @echo "Requires: $(PACKAGE_NAME)" >> $(METADATA)
- @echo "X-RunForDevice: info.product == 'Computer' " >> $(METADATA)
- @echo "X-HardwareClass: ALL" >> $(METADATA)
+
Modified: trunk/tests/lid/Makefile
===================================================================
--- trunk/tests/lid/Makefile 2011-01-27 19:42:45 UTC (rev 748)
+++ trunk/tests/lid/Makefile 2011-01-28 15:00:30 UTC (rev 749)
@@ -15,7 +15,7 @@
.PHONY: all install download clean
-FILES=$(METADATA) runtest.sh lid.py
+FILES=runtest.sh lid.py
run: $(FILES) build
./runtest.sh
@@ -29,18 +29,6 @@
# Include Common Makefile
include $(DESTDIR)/usr/share/v7/lib/v7-make.include
-# Generate the testinfo.desc here:
-$(METADATA): Makefile
- @touch $(METADATA)
- @echo "Owner: Greg Nichols <gnichols(a)redhat.com>" > $(METADATA)
- @echo "Name: $(TEST)" >> $(METADATA)
- @echo "Path: $(TEST_DIR)" >> $(METADATA)
- @echo "TestVersion: $(TESTVERSION)" >> $(METADATA)
- @echo "Description: Hardware Certification Lid Test">> $(METADATA)
- @echo "TestTime: 10m" >> $(METADATA)
- @echo "RunFor: $(PACKAGE_NAME)" >> $(METADATA)
- @echo "Requires: $(PACKAGE_NAME)" >> $(METADATA)
- @echo "X-RunForDevice: 'lid' in button.type" >> $(METADATA)
- @echo "X-Interactive: yes" >> $(METADATA)
+
Modified: trunk/tests/memory/Makefile
===================================================================
--- trunk/tests/memory/Makefile 2011-01-27 19:42:45 UTC (rev 748)
+++ trunk/tests/memory/Makefile 2011-01-28 15:00:30 UTC (rev 749)
@@ -16,7 +16,7 @@
.PHONY: all install download clean
BUILT_FILES= threaded_memtest
-FILES=$(METADATA) runtest.sh threaded_memtest.c memory.py
+FILES=runtest.sh threaded_memtest.c memory.py
run: $(FILES) build
./runtest.sh
@@ -25,7 +25,7 @@
chmod a+x ./runtest.sh ./memory.py
clean:
- rm -f $(BUILT_FILES) $(METADATA)
+ rm -f $(BUILT_FILES)
# test-specific rules:
CFLAGS+=-Wall
@@ -35,14 +35,10 @@
endif
-
threaded_memtest: threaded_memtest.c
$(CC) $(CFLAGS) -lpthread $< -o $@
# Include Common Makefile
include $(DESTDIR)/usr/share/v7/lib/v7-make.include
-# Generate the testinfo.desc here:
-# Generate the testinfo.desc here:
-$(METADATA): Makefile
- python memory.py metadata
+
Modified: trunk/tests/network/Makefile
===================================================================
--- trunk/tests/network/Makefile 2011-01-27 19:42:45 UTC (rev 748)
+++ trunk/tests/network/Makefile 2011-01-28 15:00:30 UTC (rev 749)
@@ -15,7 +15,7 @@
.PHONY: all install download clean
-FILES=$(METADATA) runtest.sh network.py
+FILES=runtest.sh network.py
run: $(FILES) build
./runtest.sh
@@ -24,7 +24,7 @@
chmod a+x ./runtest.sh ./network.py
clean:
- rm -f $(BUILT_FILES) $(METADATA)
+ rm -f $(BUILT_FILES)
server:
python network.py server $(RUNMODE)
@@ -32,6 +32,3 @@
# Include Common Makefile
include $(DESTDIR)/usr/share/v7/lib/v7-make.include
-# Generate the testinfo.desc here:
-$(METADATA): Makefile
- python network.py metadata
Modified: trunk/tests/pccard/Makefile
===================================================================
--- trunk/tests/pccard/Makefile 2011-01-27 19:42:45 UTC (rev 748)
+++ trunk/tests/pccard/Makefile 2011-01-28 15:00:30 UTC (rev 749)
@@ -15,7 +15,7 @@
.PHONY: all install download clean
-FILES=$(METADATA) runtest.sh pccard.sh
+FILES=runtest.sh pccard.sh
run: $(FILES) build
./runtest.sh
@@ -24,23 +24,10 @@
chmod a+x ./runtest.sh ./pccard.sh
clean:
- rm -f $(BUILT_FILES) $(METADATA)
+ rm -f $(BUILT_FILES)
# Include Common Makefile
include $(DESTDIR)/usr/share/v7/lib/v7-make.include
-# Generate the testinfo.desc here:
-$(METADATA): Makefile
- @touch $(METADATA)
- @echo "Owner: YangKun <ykun(a)redhat.com>" > $(METADATA)
- @echo "Name: $(TEST)" >> $(METADATA)
- @echo "Path: $(TEST_DIR)" >> $(METADATA)
- @echo "TestVersion: $(TESTVERSION)" >> $(METADATA)
- @echo "Description: HW Cert pccard test ">> $(METADATA)
- @echo "TestTime: 5m" >> $(METADATA)
- @echo "RunFor: $(PACKAGE_NAME)" >> $(METADATA)
- @echo "Requires: $(PACKAGE_NAME)" >> $(METADATA)
- @echo "X-RunForDevice: pci.device_subclass == 7 and pci.device_class == 6 " >> $(METADATA)
- @echo "X-Interactive: no " >> $(METADATA)
- @echo "X-Priority: 2" >> $(METADATA)
+
Modified: trunk/tests/pccard/pccard.py
===================================================================
--- trunk/tests/pccard/pccard.py 2011-01-27 19:42:45 UTC (rev 748)
+++ trunk/tests/pccard/pccard.py 2011-01-28 15:00:30 UTC (rev 749)
@@ -17,6 +17,7 @@
from v7.test import Test
from v7.tags import DeviceClass
+from v7.command import Command, V7CommandException
class PCCardTest(Test):
@@ -30,6 +31,17 @@
properties['pci.device_subclass'] = 7
properties['pci.device_class'] = 6
return self.planWith(devices, properties, all=False, strict=True)
+
+ def run(self):
+ try:
+ pccardSh = Command("pccard.sh")
+ pccardSh.echo()
+ return 0 # passed
+ except V7CommandException, exception:
+ print "Error: "
+ print exception
+ pccardSh.printErrors()
+
if __name__ == "__main__":
test = PCCardTest()
Modified: trunk/tests/profiler/Makefile
===================================================================
--- trunk/tests/profiler/Makefile 2011-01-27 19:42:45 UTC (rev 748)
+++ trunk/tests/profiler/Makefile 2011-01-28 15:00:30 UTC (rev 749)
@@ -15,55 +15,21 @@
# The relative path name to the test
export TEST=$(TOPLEVEL_NAMESPACE)/$(PACKAGE_NAME)/$(RELATIVE_PATH)
-# A phony target is one that is not really the name of a file.
-# It is just a name for some commands to be executed when you
-# make an explicit request. There are two reasons to use a
-# phony target: to avoid a conflict with a file of the same
-# name, and to improve performance.
-.PHONY: all install download clean
-
-# Generated information file that describes your test
-# and test requiremnets
-METADATA=testinfo.desc
-
-# A phony target is one that is not really the name of a file.
-# It is just a name for some commands to be executed when you
-# make an explicit request. There are two reasons to use a
-# phony target: to avoid a conflict with a file of the same
-# name, and to improve performance.
.PHONY:
# List of files that are needed for the test rpm
-FILES= $(METADATA) runtest.sh profiler.py Makefile
+FILES=runtest.sh profiler.py Makefile
build:
- @echo "Note: The building of this is done in runtest.sh"
- @echo "That is done by doing a make run command"
+
clean:
- rm -f *~ $(METADATA)
+ rm -f *~
-run: $(METADATA)
+run:
chmod +x ./runtest.sh ./profiler.py
./runtest.sh
-# Generate the testinfo.desc here:
-$(METADATA):
- @touch $(METADATA)
- @echo "Owner: William Cohen <wcohen(a)redhat.com>" > $(METADATA)
- @echo "Name: $(TEST)" >> $(METADATA)
- @echo "Path: $(TEST_DIR)" >> $(METADATA)
- @echo "TestVersion: $(TESTVERSION)" >> $(METADATA)
- @echo "Description: oprofile testsuite" >> $(METADATA)
- @echo "TestTime: 10m" >> $(METADATA)
- @echo "RunFor: $(PACKAGE_NAME)" >> $(METADATA)
- @echo "Requires: $(PACKAGE_NAME)" >> $(METADATA)
- @echo "Releases: -RHEL2.1" >> $(METADATA)
- @echo "Priority: Normal" >> $(METADATA)
- @echo "Type: Regression" >> $(METADATA)
- @echo "Requires: dejagnu" >> $(METADATA)
- @echo "License: Red Hat Internal" >> $(METADATA)
-
# Include Common Makefile
include $(DESTDIR)/usr/share/v7/lib/v7-make.include
Modified: trunk/tests/reboot/Makefile
===================================================================
--- trunk/tests/reboot/Makefile 2011-01-27 19:42:45 UTC (rev 748)
+++ trunk/tests/reboot/Makefile 2011-01-28 15:00:30 UTC (rev 749)
@@ -15,7 +15,7 @@
.PHONY: all install download clean
-FILES=$(METADATA) runtest.sh reboot.py
+FILES=runtest.sh reboot.py
run: $(FILES) build
./runtest.sh
@@ -24,21 +24,8 @@
chmod a+x ./runtest.sh ./reboot.py
clean:
- rm -f $(BUILT_FILES) $(METADATA)
+ rm -f $(BUILT_FILES)
# Include Common Makefile
include $(DESTDIR)/usr/share/v7/lib/v7-make.include
-# Generate the testinfo.desc here:
-$(METADATA): Makefile
- @touch $(METADATA)
- @echo "Owner: Greg Nichols <gnichols(a)redhat.com>" > $(METADATA)
- @echo "Name: $(TEST)" >> $(METADATA)
- @echo "Path: $(TEST_DIR)" >> $(METADATA)
- @echo "TestVersion: $(TESTVERSION)" >> $(METADATA)
- @echo "Description: HW Cert Reboot test ">> $(METADATA)
- @echo "TestTime: 5m" >> $(METADATA)
- @echo "RunFor: $(PACKAGE_NAME)" >> $(METADATA)
- @echo "Requires: $(PACKAGE_NAME)" >> $(METADATA)
- @echo "X-RunForDevice: info.product == 'Computer' " >> $(METADATA)
- @echo "X-Interactive: yes" >> $(METADATA)
Modified: trunk/tests/rteval/Makefile
===================================================================
--- trunk/tests/rteval/Makefile 2011-01-27 19:42:45 UTC (rev 748)
+++ trunk/tests/rteval/Makefile 2011-01-28 15:00:30 UTC (rev 749)
@@ -15,7 +15,7 @@
.PHONY: all install download clean
-FILES=$(METADATA) runtest.sh v7_rteval.py
+FILES=runtest.sh v7_rteval.py
run: $(FILES) build
./runtest.sh
@@ -29,18 +29,5 @@
# Include Common Makefile
include $(DESTDIR)/usr/share/v7/lib/v7-make.include
-# Generate the testinfo.desc here:
-$(METADATA): Makefile
- @touch $(METADATA)
- @echo "Owner: David Sommerseth <davids(a)redhat.com>" > $(METADATA)
- @echo "Name: $(TEST)" >> $(METADATA)
- @echo "Path: $(TEST_DIR)" >> $(METADATA)
- @echo "TestVersion: $(TESTVERSION)" >> $(METADATA)
- @echo "Description: Hardware Certification Real-Time kernel validation Test">> $(METADATA)
- @echo "TestTime: 10h" >> $(METADATA)
- @echo "RunFor: $(PACKAGE_NAME)" >> $(METADATA)
- @echo "Requires: $(PACKAGE_NAME)" >> $(METADATA)
-# @echo "X-RunForDevice: 'lid' in button.type" >> $(METADATA)
- @echo "X-Interactive: no" >> $(METADATA)
Modified: trunk/tests/storage/Makefile
===================================================================
--- trunk/tests/storage/Makefile 2011-01-27 19:42:45 UTC (rev 748)
+++ trunk/tests/storage/Makefile 2011-01-28 15:00:30 UTC (rev 749)
@@ -15,7 +15,7 @@
.PHONY: all install download clean
-FILES=$(METADATA) runtest.sh storage.py
+FILES=runtest.sh storage.py
run: $(FILES) build
./runtest.sh
@@ -24,21 +24,8 @@
chmod a+x ./runtest.sh ./storage.py
clean:
- rm -f $(BUILT_FILES) $(METADATA)
+ rm -f $(BUILT_FILES)
# Include Common Makefile
include $(DESTDIR)/usr/share/v7/lib/v7-make.include
-# Generate the testinfo.desc here:
-$(METADATA): Makefile
- @touch $(METADATA)
- @echo "Owner: YangKun <ykun(a)redhat.com>" > $(METADATA)
- @echo "Name: $(TEST)" >> $(METADATA)
- @echo "Path: $(TEST_DIR)" >> $(METADATA)
- @echo "TestVersion: $(TESTVERSION)" >> $(METADATA)
- @echo "Description: HW Cert Storage test ">> $(METADATA)
- @echo "TestTime: 2h" >> $(METADATA)
- @echo "RunFor: $(PACKAGE_NAME)" >> $(METADATA)
- @echo "Requires: $(PACKAGE_NAME)" >> $(METADATA)
- @echo "X-RunForDevice: (('storage' in info.capabilities) and ('block' in info.capabilities) and (storage.drive_type == 'disk')) or (info.linux.driver in ['cciss', 'vbd', 'ips']) " >> $(METADATA)
-
Modified: trunk/tests/suspend/Makefile
===================================================================
--- trunk/tests/suspend/Makefile 2011-01-27 19:42:45 UTC (rev 748)
+++ trunk/tests/suspend/Makefile 2011-01-28 15:00:30 UTC (rev 749)
@@ -15,7 +15,7 @@
.PHONY: all install download clean
-FILES=$(METADATA) runtest.sh suspend.py
+FILES=runtest.sh suspend.py
run: $(FILES) build
./runtest.sh
@@ -29,18 +29,6 @@
# Include Common Makefile
include $(DESTDIR)/usr/share/v7/lib/v7-make.include
-# Generate the testinfo.desc here:
-$(METADATA): Makefile
- @touch $(METADATA)
- @echo "Owner: Greg Nichols <gnichols(a)redhat.com>" > $(METADATA)
- @echo "Name: $(TEST)" >> $(METADATA)
- @echo "Path: $(TEST_DIR)" >> $(METADATA)
- @echo "TestVersion: $(TESTVERSION)" >> $(METADATA)
- @echo "Description: Hardware Certification Battery Test">> $(METADATA)
- @echo "TestTime: 10m" >> $(METADATA)
- @echo "RunFor: $(PACKAGE_NAME)" >> $(METADATA)
- @echo "Requires: $(PACKAGE_NAME)" >> $(METADATA)
- @echo "X-RunForDevice: 'battery' in info.category" >> $(METADATA)
- @echo "X-Interactive: yes" >> $(METADATA)
+
Modified: trunk/tests/tape/Makefile
===================================================================
--- trunk/tests/tape/Makefile 2011-01-27 19:42:45 UTC (rev 748)
+++ trunk/tests/tape/Makefile 2011-01-28 15:00:30 UTC (rev 749)
@@ -15,7 +15,7 @@
.PHONY: all install download clean
-FILES=$(METADATA) runtest.sh tape.py
+FILES=runtest.sh tape.py
run: $(FILES) build
./runtest.sh
@@ -25,23 +25,11 @@
clean:
- rm -f $(BUILT_FILES) $(METADATA)
+ rm -f $(BUILT_FILES)
# Include Common Makefile
include $(DESTDIR)/usr/share/v7/lib/v7-make.include
-# Generate the testinfo.desc here:
-$(METADATA): Makefile
- @touch $(METADATA)
- @echo "Owner: YangKun <ykun(a)redhat.com>" > $(METADATA)
- @echo "Name: $(TEST)" >> $(METADATA)
- @echo "Path: $(TEST_DIR)" >> $(METADATA)
- @echo "TestVersion: $(TESTVERSION)" >> $(METADATA)
- @echo "Description: HW Cert tape test ">> $(METADATA)
- @echo "TestTime: 4h" >> $(METADATA)
- @echo "RunFor: $(PACKAGE_NAME)" >> $(METADATA)
- @echo "Requires: $(PACKAGE_NAME)" >> $(METADATA)
- @echo "X-RunForDevice: 'tape' in storage.drive_type or info.linux.driver == 'st'" >> $(METADATA)
- @echo "X-Interactive: yes" >> $(METADATA)
+
Modified: trunk/tests/usb/Makefile
===================================================================
--- trunk/tests/usb/Makefile 2011-01-27 19:42:45 UTC (rev 748)
+++ trunk/tests/usb/Makefile 2011-01-28 15:00:30 UTC (rev 749)
@@ -24,11 +24,8 @@
chmod a+x ./runtest.sh ./usb.py
clean:
- rm -f $(BUILT_FILES) $(METADATA)
+ rm -f $(BUILT_FILES)
# Include Common Makefile
include $(DESTDIR)/usr/share/v7/lib/v7-make.include
-# Generate the testinfo.desc here:
-$(METADATA): Makefile
- python usb.py metadata
Modified: trunk/tests/video/Makefile
===================================================================
--- trunk/tests/video/Makefile 2011-01-27 19:42:45 UTC (rev 748)
+++ trunk/tests/video/Makefile 2011-01-28 15:00:30 UTC (rev 749)
@@ -15,7 +15,7 @@
.PHONY: all install download clean
-FILES=$(METADATA) runtest.sh video.py x11perftest
+FILES=runtest.sh video.py x11perftest
run: $(FILES) build
./runtest.sh
@@ -24,11 +24,8 @@
chmod a+x ./runtest.sh ./video.py
clean:
- rm -f *~ $(BUILT_FILES) $(METADATA)
+ rm -f *~ $(BUILT_FILES)
# Include Common Makefile
include $(DESTDIR)/usr/share/v7/lib/v7-make.include
-# Generate the testinfo.desc here:
-$(METADATA): Makefile
- python video.py metadata
Modified: trunk/tests/wlan/Makefile
===================================================================
--- trunk/tests/wlan/Makefile 2011-01-27 19:42:45 UTC (rev 748)
+++ trunk/tests/wlan/Makefile 2011-01-28 15:00:30 UTC (rev 749)
@@ -15,7 +15,7 @@
.PHONY: all install download clean
-FILES=$(METADATA) runtest.sh wlan.py
+FILES=runtest.sh wlan.py
run: $(FILES) build
./runtest.sh
@@ -24,12 +24,9 @@
chmod a+x ./runtest.sh ./wlan.py
clean:
- rm -f $(BUILT_FILES) $(METADATA)
+ rm -f $(BUILT_FILES)
# Include Common Makefile
include $(DESTDIR)/usr/share/v7/lib/v7-make.include
-# Generate the testinfo.desc here:
-$(METADATA): Makefile
- python wlan.py metadata
13 years, 3 months
r748 - trunk/tests/info
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-01-27 19:42:45 +0000 (Thu, 27 Jan 2011)
New Revision: 748
Modified:
trunk/tests/info/info.py
Log:
589739 - CPUSCALING test includes unprocessed tags around displayed text
Modified: trunk/tests/info/info.py
===================================================================
--- trunk/tests/info/info.py 2011-01-27 19:42:00 UTC (rev 747)
+++ trunk/tests/info/info.py 2011-01-27 19:42:45 UTC (rev 748)
@@ -109,7 +109,6 @@
errors.append(exception)
if len(errors) > 0:
- print "\nInfo test failed verification:"
for error in errors:
print error
return False
@@ -388,7 +387,7 @@
sys.stdout.flush()
if tarFile:
- outputDirectory = os.getcwd()
+ outputDirectory = os.path.dirname(self.outputFile)
shutil.copy(tarFile, outputDirectory)
print "Copied %s %s to %s" % (reportCommand, tarFile, outputDirectory)
sys.stdout.flush()
13 years, 3 months