diff --git a/tests/ids-files/Makefile b/tests/ids-files/Makefile deleted file mode 100644 index 8779c9c..0000000 --- a/tests/ids-files/Makefile +++ /dev/null @@ -1,65 +0,0 @@ -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Makefile of /kernel/hwdata/Sanity/ids-files -# Description: compares upstream ID files with our ID files -# Author: Milos Malik -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Copyright (c) 2009 Red Hat, Inc. All rights reserved. -# -# This copyrighted material is made available to anyone wishing -# to use, modify, copy, or redistribute it subject to the terms -# and conditions of the GNU General Public License version 2. -# -# This program is distributed in the hope that it will be -# useful, but WITHOUT ANY WARRANTY; without even the implied -# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR -# PURPOSE. See the GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public -# License along with this program; if not, write to the Free -# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -# Boston, MA 02110-1301, USA. -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -export TEST=/kernel/hwdata/Sanity/ids-files -export TESTVERSION=1.0 - -BUILT_FILES= - -FILES=$(METADATA) runtest.sh Makefile PURPOSE - -.PHONY: all install download clean - -run: $(FILES) build - ./runtest.sh - -build: $(BUILT_FILES) - chmod a+x runtest.sh - chcon -t bin_t runtest.sh - -clean: - rm -f *~ $(BUILT_FILES) - -include /usr/share/rhts/lib/rhts-make.include - -$(METADATA): Makefile - @echo "Owner: Milos Malik " > $(METADATA) - @echo "Name: $(TEST)" >> $(METADATA) - @echo "TestVersion: $(TESTVERSION)" >> $(METADATA) - @echo "Path: $(TEST_DIR)" >> $(METADATA) - @echo "Description: compares upstream ID files with our ID files" >> $(METADATA) - @echo "Type: Sanity" >> $(METADATA) - @echo "TestTime: 5m" >> $(METADATA) - @echo "RunFor: hwdata" >> $(METADATA) - @echo "Requires: hwdata" >> $(METADATA) - @echo "Requires: wget" >> $(METADATA) - @echo "Priority: Normal" >> $(METADATA) - @echo "License: GPLv2" >> $(METADATA) - @echo "Confidential: no" >> $(METADATA) - @echo "Destructive: no" >> $(METADATA) - - rhts-lint $(METADATA) - diff --git a/tests/ids-files/PURPOSE b/tests/ids-files/PURPOSE deleted file mode 100644 index 4a39624..0000000 --- a/tests/ids-files/PURPOSE +++ /dev/null @@ -1,6 +0,0 @@ -PURPOSE of /kernel/hwdata/Sanity/ids-files - -Description: compares upstream ID files with our ID files - -Author: Milos Malik - diff --git a/tests/ids-files/runtest.sh b/tests/ids-files/runtest.sh deleted file mode 100755 index 727bafd..0000000 --- a/tests/ids-files/runtest.sh +++ /dev/null @@ -1,72 +0,0 @@ -#!/bin/bash -# vim: dict=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# runtest.sh of /kernel/hwdata/Sanity/ids-files -# Description: compares upstream ID files with our ID files -# Author: Milos Malik -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Copyright (c) 2009 Red Hat, Inc. All rights reserved. -# -# This copyrighted material is made available to anyone wishing -# to use, modify, copy, or redistribute it subject to the terms -# and conditions of the GNU General Public License version 2. -# -# This program is distributed in the hope that it will be -# useful, but WITHOUT ANY WARRANTY; without even the implied -# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR -# PURPOSE. See the GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public -# License along with this program; if not, write to the Free -# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -# Boston, MA 02110-1301, USA. -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -# Include rhts environment -. /usr/bin/rhts-environment.sh -. /usr/lib/beakerlib/beakerlib.sh - -PACKAGE="hwdata" -HWDATA_DIR="/usr/share/hwdata" -PCI_IDS_FILE="pci.ids" -PCI_IDS_URL="https://raw.githubusercontent.com/pciutils/pciids/master/pci.ids" -USB_IDS_FILE="usb.ids" -USB_IDS_URL="http://www.linux-usb.org/usb.ids" - -rlJournalStart - rlPhaseStartSetup - rlAssertRpm ${PACKAGE} - rlAssertRpm wget - rlAssertExists ${HWDATA_DIR}/${PCI_IDS_FILE} - rlAssertExists ${HWDATA_DIR}/${USB_IDS_FILE} - rlPhaseEnd - - rlPhaseStartTest - rlRun "wget -q -t 4 ${PCI_IDS_URL}" - rlAssertExists ${PCI_IDS_FILE} - echo "Lines in upstream file: "`wc -l < ${PCI_IDS_FILE}` - echo "Lines in our file: "`wc -l < ${HWDATA_DIR}/${PCI_IDS_FILE}` - echo "Common lines: "`comm -1 -2 ${PCI_IDS_FILE} ${HWDATA_DIR}/${PCI_IDS_FILE} | wc -l` - echo "Different lines in upstream file: "`comm -2 -3 ${PCI_IDS_FILE} ${HWDATA_DIR}/${PCI_IDS_FILE} | wc -l` - echo "Different lines in our file: "`comm -1 -3 ${PCI_IDS_FILE} ${HWDATA_DIR}/${PCI_IDS_FILE} | wc -l` - - rlRun "wget -q -t 4 ${USB_IDS_URL}" - rlAssertExists ${USB_IDS_FILE} - echo "Lines in upstream file: "`wc -l < ${USB_IDS_FILE}` - echo "Lines in our file: "`wc -l < ${HWDATA_DIR}/${USB_IDS_FILE}` - echo "Common lines: "`comm -1 -2 ${USB_IDS_FILE} ${HWDATA_DIR}/${USB_IDS_FILE} | wc -l` - echo "Different lines in upstream file: "`comm -2 -3 ${USB_IDS_FILE} ${HWDATA_DIR}/${USB_IDS_FILE} | wc -l` - echo "Different lines in our file: "`comm -1 -3 ${USB_IDS_FILE} ${HWDATA_DIR}/${USB_IDS_FILE} | wc -l` - rlPhaseEnd - - rlPhaseStartCleanup - rlRun "rm -f ${PCI_IDS_FILE}" - rlRun "rm -f ${USB_IDS_FILE}" - rlPhaseEnd -rlJournalPrintText -rlJournalEnd - diff --git a/tests/tests.yml b/tests/tests.yml index cf0f3cb..98fb230 100644 --- a/tests/tests.yml +++ b/tests/tests.yml @@ -6,7 +6,6 @@ tags: - classic tests: - - ids-files - syntax required_packages: - hwdata diff --git a/v0.379-10.4.tar.gz b/v0.379-10.4.tar.gz new file mode 100644 index 0000000..3cf7b54 Binary files /dev/null and b/v0.379-10.4.tar.gz differ