From e3eeddbc857a5647135c42c97be75198929a8ce1 Mon Sep 17 00:00:00 2001

From: "Richard W.M. Jones" <rjones@redhat.com>

Date: Thu, 3 Oct 2019 09:53:49 +0100

Subject: [PATCH 15/21] Arrange tests in subdirectories.

This simplifies and isolates each test.

---

 .gitignore                                    |   6 +-

 Makefile.am                                   | 261 +-----------------

 configure.ac                                  |  77 +++++-

 tests/Makefile.am                             |  20 ++

 tests/aws-baremetal-x86/Makefile.am           |  28 ++

 .../test.sh}                                  |   4 +-

 tests/aws-kvm-arm/Makefile.am                 |  28 ++

 .../test.sh}                                  |   4 +-

 tests/aws-kvm-x86/Makefile.am                 |  28 ++

 .../test.sh}                                  |   4 +-

 tests/aws-xen-x86/Makefile.am                 |  28 ++

 .../test.sh}                                  |   4 +-

 tests/baremetal/Makefile.am                   |  28 ++

 .../{test-baremetal.sh => baremetal/test.sh}  |   4 +-

 tests/bhyve/Makefile.am                       |  27 ++

 tests/{test-bhyve.sh => bhyve/test.sh}        |   4 +-

 tests/docker/Makefile.am                      |  29 ++

 tests/{test-docker.sh => docker/test.sh}      |   4 +-

 tests/esx4.1/Makefile.am                      |  28 ++

 tests/{test-esx4.1.sh => esx4.1/test.sh}      |   4 +-

 tests/hyperv/Makefile.am                      |  28 ++

 tests/{test-hyperv.sh => hyperv/test.sh}      |   4 +-

 tests/kvm-explicit-cpu/Makefile.am            |  28 ++

 .../test.sh}                                  |   4 +-

 tests/kvm/Makefile.am                         |  28 ++

 tests/{test-kvm.sh => kvm/test.sh}            |   4 +-

 tests/ldoms/Makefile.am                       |  28 ++

 tests/{test-ldoms.sh => ldoms/test.sh}        |   4 +-

 tests/linux-vserver/Makefile.am               |  28 ++

 .../test.sh}                                  |   4 +-

 tests/lkvm-arm/Makefile.am                    |  29 ++

 tests/{test-lkvm-arm.sh => lkvm-arm/test.sh}  |   4 +-

 tests/lkvm/Makefile.am                        |  28 ++

 tests/{test-lkvm.sh => lkvm/test.sh}          |   4 +-

 tests/lx86/Makefile.am                        |  28 ++

 tests/{test-lx86.sh => lx86/test.sh}          |   4 +-

 tests/lxc/Makefile.am                         |  29 ++

 tests/{test-lxc.sh => lxc/test.sh}            |   4 +-

 tests/parallels-desktop/Makefile.am           |  28 ++

 .../test.sh}                                  |   4 +-

 tests/ppc64-baremetal/Makefile.am             |  27 ++

 .../test.sh}                                  |   4 +-

 tests/ppc64-kvm/Makefile.am                   |  28 ++

 .../{test-ppc64-kvm.sh => ppc64-kvm/test.sh}  |   4 +-

 tests/ppc64-lpar-dedicated/Makefile.am        |  28 ++

 .../test.sh}                                  |   4 +-

 tests/ppc64-lpar-shared/Makefile.am           |  29 ++

 .../test.sh}                                  |   4 +-

 tests/qemu-arm/Makefile.am                    |  29 ++

 tests/{test-qemu-arm.sh => qemu-arm/test.sh}  |   4 +-

 tests/qemu-smbios-kvm/Makefile.am             |  28 ++

 .../test.sh}                                  |   4 +-

 tests/qemu-smbios/Makefile.am                 |  28 ++

 .../test.sh}                                  |   4 +-

 tests/qemu/Makefile.am                        |  28 ++

 tests/{test-qemu.sh => qemu/test.sh}          |   4 +-

 tests/rhel5-xen-dom0/Makefile.am              |  48 ++++

 .../test.sh}                                  |   4 +-

 tests/rhel5-xen-domU-hvm-ia64/Makefile.am     |  33 +++

 .../test.sh}                                  |   4 +-

 tests/rhel5-xen-domU-hvm/Makefile.am          |  28 ++

 .../test.sh}                                  |   4 +-

 tests/rhel5-xen-domU-pv/Makefile.am           |  46 +++

 .../test.sh}                                  |   4 +-

 tests/rhev/Makefile.am                        |  28 ++

 tests/{test-rhev.sh => rhev/test.sh}          |   4 +-

 tests/vmm/Makefile.am                         |  27 ++

 tests/{test-vmm.sh => vmm/test.sh}            |   4 +-

 tests/xen-arm/Makefile.am                     |  29 ++

 tests/{test-xen-arm.sh => xen-arm/test.sh}    |   4 +-

 tests/zvm/Makefile.am                         |  29 ++

 tests/{test-zvm.sh => zvm/test.sh}            |   4 +-

 72 files changed, 1138 insertions(+), 361 deletions(-)

 create mode 100644 tests/Makefile.am

 create mode 100644 tests/aws-baremetal-x86/Makefile.am

 rename tests/{test-aws-baremetal-x86.sh => aws-baremetal-x86/test.sh} (93%)

 create mode 100644 tests/aws-kvm-arm/Makefile.am

 rename tests/{test-aws-kvm-arm.sh => aws-kvm-arm/test.sh} (94%)

 create mode 100644 tests/aws-kvm-x86/Makefile.am

 rename tests/{test-aws-kvm-x86.sh => aws-kvm-x86/test.sh} (94%)

 create mode 100644 tests/aws-xen-x86/Makefile.am

 rename tests/{test-aws-xen-x86.sh => aws-xen-x86/test.sh} (94%)

 create mode 100644 tests/baremetal/Makefile.am

 rename tests/{test-baremetal.sh => baremetal/test.sh} (94%)

 create mode 100644 tests/bhyve/Makefile.am

 rename tests/{test-bhyve.sh => bhyve/test.sh} (94%)

 create mode 100644 tests/docker/Makefile.am

 rename tests/{test-docker.sh => docker/test.sh} (94%)

 create mode 100644 tests/esx4.1/Makefile.am

 rename tests/{test-esx4.1.sh => esx4.1/test.sh} (94%)

 create mode 100644 tests/hyperv/Makefile.am

 rename tests/{test-hyperv.sh => hyperv/test.sh} (94%)

 create mode 100644 tests/kvm-explicit-cpu/Makefile.am

 rename tests/{test-kvm-explicit-cpu.sh => kvm-explicit-cpu/test.sh} (94%)

 create mode 100644 tests/kvm/Makefile.am

 rename tests/{test-kvm.sh => kvm/test.sh} (95%)

 create mode 100644 tests/ldoms/Makefile.am

 rename tests/{test-ldoms.sh => ldoms/test.sh} (94%)

 create mode 100644 tests/linux-vserver/Makefile.am

 rename tests/{test-linux-vserver.sh => linux-vserver/test.sh} (94%)

 create mode 100644 tests/lkvm-arm/Makefile.am

 rename tests/{test-lkvm-arm.sh => lkvm-arm/test.sh} (94%)

 create mode 100644 tests/lkvm/Makefile.am

 rename tests/{test-lkvm.sh => lkvm/test.sh} (94%)

 create mode 100644 tests/lx86/Makefile.am

 rename tests/{test-lx86.sh => lx86/test.sh} (95%)

 create mode 100644 tests/lxc/Makefile.am

 rename tests/{test-lxc.sh => lxc/test.sh} (95%)

 create mode 100644 tests/parallels-desktop/Makefile.am

 rename tests/{test-parallels-desktop.sh => parallels-desktop/test.sh} (94%)

 create mode 100644 tests/ppc64-baremetal/Makefile.am

 rename tests/{test-ppc64-baremetal.sh => ppc64-baremetal/test.sh} (94%)

 create mode 100644 tests/ppc64-kvm/Makefile.am

 rename tests/{test-ppc64-kvm.sh => ppc64-kvm/test.sh} (94%)

 create mode 100644 tests/ppc64-lpar-dedicated/Makefile.am

 rename tests/{test-ppc64-lpar-dedicated.sh => ppc64-lpar-dedicated/test.sh} (94%)

 create mode 100644 tests/ppc64-lpar-shared/Makefile.am

 rename tests/{test-ppc64-lpar-shared.sh => ppc64-lpar-shared/test.sh} (94%)

 create mode 100644 tests/qemu-arm/Makefile.am

 rename tests/{test-qemu-arm.sh => qemu-arm/test.sh} (94%)

 create mode 100644 tests/qemu-smbios-kvm/Makefile.am

 rename tests/{test-qemu-smbios-kvm.sh => qemu-smbios-kvm/test.sh} (94%)

 create mode 100644 tests/qemu-smbios/Makefile.am

 rename tests/{test-qemu-smbios.sh => qemu-smbios/test.sh} (94%)

 create mode 100644 tests/qemu/Makefile.am

 rename tests/{test-qemu.sh => qemu/test.sh} (94%)

 create mode 100644 tests/rhel5-xen-dom0/Makefile.am

 rename tests/{test-rhel5-xen-dom0.sh => rhel5-xen-dom0/test.sh} (94%)

 create mode 100644 tests/rhel5-xen-domU-hvm-ia64/Makefile.am

 rename tests/{test-rhel5-xen-domU-hvm-ia64.sh => rhel5-xen-domU-hvm-ia64/test.sh} (93%)

 create mode 100644 tests/rhel5-xen-domU-hvm/Makefile.am

 rename tests/{test-rhel5-xen-domU-hvm.sh => rhel5-xen-domU-hvm/test.sh} (94%)

 create mode 100644 tests/rhel5-xen-domU-pv/Makefile.am

 rename tests/{test-rhel5-xen-domU-pv.sh => rhel5-xen-domU-pv/test.sh} (94%)

 create mode 100644 tests/rhev/Makefile.am

 rename tests/{test-rhev.sh => rhev/test.sh} (94%)

 create mode 100644 tests/vmm/Makefile.am

 rename tests/{test-vmm.sh => vmm/test.sh} (95%)

 create mode 100644 tests/xen-arm/Makefile.am

 rename tests/{test-xen-arm.sh => xen-arm/test.sh} (94%)

 create mode 100644 tests/zvm/Makefile.am

 rename tests/{test-zvm.sh => zvm/test.sh} (95%)

diff --git a/.gitignore b/.gitignore

index f565f34..4833fd6 100644

--- a/.gitignore

+++ b/.gitignore

@@ -1,12 +1,14 @@

 *~

+*.bak

 *.log

 *.trs

 *.o

+Makefile

+Makefile.in

+

 /virt-what-*.tar.gz

 /.deps

-/Makefile

-/Makefile.in

 /aclocal.m4

 /autom4te.cache

 /compile

diff --git a/Makefile.am b/Makefile.am

index 48fd518..b62738f 100644

--- a/Makefile.am

+++ b/Makefile.am

@@ -15,9 +15,13 @@

 # along with this program; if not, write to the Free Software

 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

+AM_CPPFLAGS = -Wall

+

 CLEANFILES = virt-what *~

-AM_CPPFLAGS = -Wall

+EXTRA_DIST = virt-what.in virt-what.pod

+

+SUBDIRS = . tests

 sbin_SCRIPTS = virt-what

 libexec_PROGRAMS = virt-what-cpuid-helper

@@ -37,258 +41,3 @@ virt-what.txt: virt-what.pod

 	pod2text $? > $@

 endif

-

-TESTS = \

-	tests/test-aws-baremetal-x86.sh \

-	tests/test-aws-kvm-arm.sh \

-	tests/test-aws-kvm-x86.sh \

-	tests/test-aws-xen-x86.sh \

-	tests/test-baremetal.sh \

-	tests/test-bhyve.sh \

-	tests/test-docker.sh \

-	tests/test-esx4.1.sh \

-	tests/test-hyperv.sh \

-	tests/test-kvm.sh \

-	tests/test-kvm-explicit-cpu.sh \

-	tests/test-linux-vserver.sh \

-	tests/test-ldoms.sh \

-	tests/test-lkvm.sh \

-	tests/test-lkvm-arm.sh \

-	tests/test-lxc.sh \

-	tests/test-lx86.sh \

-	tests/test-parallels-desktop.sh \

-	tests/test-ppc64-baremetal.sh \

-	tests/test-ppc64-kvm.sh \

-	tests/test-ppc64-lpar-dedicated.sh \

-	tests/test-ppc64-lpar-shared.sh \

-	tests/test-qemu.sh \

-	tests/test-qemu-arm.sh \

-	tests/test-qemu-smbios.sh \

-	tests/test-qemu-smbios-kvm.sh \

-	tests/test-rhel5-xen-dom0.sh \

-	tests/test-rhel5-xen-domU-hvm.sh \

-	tests/test-rhel5-xen-domU-hvm-ia64.sh \

-	tests/test-rhel5-xen-domU-pv.sh \

-	tests/test-rhev.sh \

-	tests/test-vmm.sh \

-	tests/test-xen-arm.sh \

-	tests/test-zvm.sh

-

-EXTRA_DIST = \

-	virt-what.in \

-	virt-what.pod \

-	tests/aws-baremetal-x86/proc/cpuinfo \

-	tests/aws-baremetal-x86/proc/self/status \

-	tests/aws-baremetal-x86/sbin/dmidecode \

-	tests/aws-baremetal-x86/sbin/uname \

-	tests/aws-baremetal-x86/sbin/virt-what-cpuid-helper \

-	tests/aws-kvm-x86/proc/cpuinfo \

-	tests/aws-kvm-x86/proc/self/status \

-	tests/aws-kvm-x86/sbin/dmidecode \

-	tests/aws-kvm-x86/sbin/uname \

-	tests/aws-kvm-x86/sbin/virt-what-cpuid-helper \

-	tests/aws-xen-x86/proc/cpuinfo \

-	tests/aws-xen-x86/proc/self/status \

-	tests/aws-xen-x86/sbin/dmidecode \

-	tests/aws-xen-x86/sbin/uname \

-	tests/aws-xen-x86/sbin/virt-what-cpuid-helper \

-	tests/baremetal/proc/cpuinfo \

-	tests/baremetal/proc/self/status \

-	tests/baremetal/sbin/dmidecode \

-	tests/baremetal/sbin/uname \

-	tests/baremetal/sbin/virt-what-cpuid-helper \

-	tests/bhyve/proc/cpuinfo \

-	tests/bhyve/sbin/dmidecode \

-	tests/bhyve/sbin/uname \

-	tests/bhyve/sbin/virt-what-cpuid-helper \

-	tests/docker/.dockerinit \

-	tests/docker/proc/cpuinfo \

-	tests/docker/proc/self/status \

-	tests/docker/sbin/dmidecode \

-	tests/docker/sbin/uname \

-	tests/docker/sbin/virt-what-cpuid-helper \

-	tests/esx4.1/proc/cpuinfo \

-	tests/esx4.1/proc/self/status \

-	tests/esx4.1/sbin/dmidecode \

-	tests/esx4.1/sbin/uname \

-	tests/esx4.1/sbin/virt-what-cpuid-helper \

-	tests/hyperv/proc/cpuinfo \

-	tests/hyperv/proc/self/status \

-	tests/hyperv/sbin/dmidecode \

-	tests/hyperv/sbin/uname \

-	tests/hyperv/sbin/virt-what-cpuid-helper \

-	tests/kvm/proc/cpuinfo \

-	tests/kvm/proc/self/status \

-	tests/kvm/sbin/dmidecode \

-	tests/kvm/sbin/uname \

-	tests/kvm/sbin/virt-what-cpuid-helper \

-	tests/kvm-explicit-cpu/proc/cpuinfo \

-	tests/kvm-explicit-cpu/proc/self/status \

-	tests/kvm-explicit-cpu/sbin/dmidecode \

-	tests/kvm-explicit-cpu/sbin/uname \

-	tests/kvm-explicit-cpu/sbin/virt-what-cpuid-helper \

-	tests/ldoms/dev/mdesc \

-	tests/ldoms/proc/cpuinfo \

-	tests/ldoms/sbin/uname \

-	tests/ldoms/sbin/virt-what-cpuid-helper \

-	tests/linux-vserver/proc/cpuinfo \

-	tests/linux-vserver/proc/self/status \

-	tests/linux-vserver/sbin/dmidecode \

-	tests/linux-vserver/sbin/uname \

-	tests/linux-vserver/sbin/virt-what-cpuid-helper \

-	tests/lkvm/proc/cpuinfo \

-	tests/lkvm/proc/self/status \

-	tests/lkvm/sbin/dmidecode \

-	tests/lkvm/sbin/uname \

-	tests/lkvm/sbin/virt-what-cpuid-helper \

-	tests/lkvm-arm/proc/cpuinfo \

-	tests/lkvm-arm/proc/device-tree/compatible \

-	tests/lkvm-arm/proc/self/status \

-	tests/lkvm-arm/sbin/dmidecode \

-	tests/lkvm-arm/sbin/uname \

-	tests/lkvm-arm/sbin/virt-what-cpuid-helper \

-	tests/lxc/proc/1/environ \

-	tests/lxc/proc/cpuinfo \

-	tests/lxc/proc/self/status \

-	tests/lxc/sbin/dmidecode \

-	tests/lxc/sbin/uname \

-	tests/lxc/sbin/virt-what-cpuid-helper \

-	tests/lx86/proc/cpuinfo \

-	tests/lx86/proc/self/status \

-	tests/lx86/sbin/dmidecode \

-	tests/lx86/sbin/uname \

-	tests/lx86/sbin/virt-what-cpuid-helper \

-	tests/parallels-desktop/proc/cpuinfo \

-	tests/parallels-desktop/proc/self/status \

-	tests/parallels-desktop/sbin/dmidecode \

-	tests/parallels-desktop/sbin/uname \

-	tests/parallels-desktop/sbin/virt-what-cpuid-helper \

-	tests/ppc64-baremetal/proc/cpuinfo \

-	tests/ppc64-baremetal/sbin/dmidecode \

-	tests/ppc64-baremetal/sbin/uname \

-	tests/ppc64-baremetal/sbin/virt-what-cpuid-helper \

-	tests/ppc64-kvm/proc/cpuinfo \

-	tests/ppc64-kvm/proc/self/status \

-	tests/ppc64-kvm/sbin/dmidecode \

-	tests/ppc64-kvm/sbin/uname \

-	tests/ppc64-kvm/sbin/virt-what-cpuid-helper \

-	tests/ppc64-lpar-dedicated/proc/cpuinfo \

-	tests/ppc64-lpar-dedicated/proc/ppc64/lparcfg \

-	tests/ppc64-lpar-dedicated/sbin/dmidecode \

-	tests/ppc64-lpar-dedicated/sbin/uname \

-	tests/ppc64-lpar-dedicated/sbin/virt-what-cpuid-helper \

-	tests/ppc64-lpar-shared/sbin/dmidecode \

-	tests/ppc64-lpar-shared/sbin/uname \

-	tests/ppc64-lpar-shared/sbin/virt-what-cpuid-helper \

-	tests/ppc64-lpar-shared/proc/cpuinfo \

-	tests/ppc64-lpar-shared/proc/self/status \

-	tests/ppc64-lpar-shared/proc/ppc64/lparcfg \

-	tests/ppc64-lpar-shared/sbin/dmidecode \

-	tests/ppc64-lpar-shared/sbin/uname \

-	tests/ppc64-lpar-shared/sbin/virt-what-cpuid-helper \

-	tests/qemu/proc/cpuinfo \

-	tests/qemu/proc/self/status \

-	tests/qemu/sbin/dmidecode \

-	tests/qemu/sbin/uname \

-	tests/qemu/sbin/virt-what-cpuid-helper \

-	tests/qemu-arm/proc/cpuinfo \

-	tests/qemu-arm/proc/device-tree/fw-cfg@9020000/compatible \

-	tests/qemu-arm/proc/self/status \

-	tests/qemu-arm/sbin/dmidecode \

-	tests/qemu-arm/sbin/uname \

-	tests/qemu-arm/sbin/virt-what-cpuid-helper \

-	tests/qemu-smbios/proc/cpuinfo \

-	tests/qemu-smbios/proc/self/status \

-	tests/qemu-smbios/sbin/dmidecode \

-	tests/qemu-smbios/sbin/uname \

-	tests/qemu-smbios/sbin/virt-what-cpuid-helper \

-	tests/qemu-smbios-kvm/proc/cpuinfo \

-	tests/qemu-smbios-kvm/proc/self/status \

-	tests/qemu-smbios-kvm/sbin/dmidecode \

-	tests/qemu-smbios-kvm/sbin/uname \

-	tests/qemu-smbios-kvm/sbin/virt-what-cpuid-helper \

-	tests/rhel5-xen-dom0/proc/cpuinfo \

-	tests/rhel5-xen-dom0/proc/self/status \

-	tests/rhel5-xen-dom0/proc/xen/balloon \

-	tests/rhel5-xen-dom0/proc/xen/capabilities \

-	tests/rhel5-xen-dom0/proc/xen/privcmd \

-	tests/rhel5-xen-dom0/proc/xen/xenbus \

-	tests/rhel5-xen-dom0/proc/xen/xsd_kva \

-	tests/rhel5-xen-dom0/proc/xen/xsd_port \

-	tests/rhel5-xen-dom0/sbin/dmidecode \

-	tests/rhel5-xen-dom0/sbin/uname \

-	tests/rhel5-xen-dom0/sbin/virt-what-cpuid-helper \

-	tests/rhel5-xen-dom0/sys/hypervisor/properties/pagesize \

-	tests/rhel5-xen-dom0/sys/hypervisor/properties/changeset \

-	tests/rhel5-xen-dom0/sys/hypervisor/properties/virtual_start \

-	tests/rhel5-xen-dom0/sys/hypervisor/properties/capabilities \

-	tests/rhel5-xen-dom0/sys/hypervisor/properties/writable_pt \

-	tests/rhel5-xen-dom0/sys/hypervisor/type \

-	tests/rhel5-xen-dom0/sys/hypervisor/vmcoreinfo \

-	tests/rhel5-xen-dom0/sys/hypervisor/version/minor \

-	tests/rhel5-xen-dom0/sys/hypervisor/version/major \

-	tests/rhel5-xen-dom0/sys/hypervisor/version/extra \

-	tests/rhel5-xen-dom0/sys/hypervisor/compilation/compiler \

-	tests/rhel5-xen-dom0/sys/hypervisor/compilation/compiled_by \

-	tests/rhel5-xen-dom0/sys/hypervisor/compilation/compile_date \

-	tests/rhel5-xen-dom0/sys/hypervisor/uuid \

-	tests/rhel5-xen-domU-hvm/proc/cpuinfo \

-	tests/rhel5-xen-domU-hvm/proc/self/status \

-	tests/rhel5-xen-domU-hvm/sbin/dmidecode \

-	tests/rhel5-xen-domU-hvm/sbin/uname \

-	tests/rhel5-xen-domU-hvm/sbin/virt-what-cpuid-helper \

-	tests/rhel5-xen-domU-hvm-ia64/proc/cpuinfo \

-	tests/rhel5-xen-domU-hvm-ia64/proc/self/status \

-	tests/rhel5-xen-domU-hvm-ia64/sbin/dmidecode \

-	tests/rhel5-xen-domU-hvm-ia64/sbin/uname \

-	tests/rhel5-xen-domU-hvm-ia64/sbin/virt-what-cpuid-helper \

-	tests/rhel5-xen-domU-hvm-ia64/sys/bus/xen/drivers/vbd/bind \

-	tests/rhel5-xen-domU-hvm-ia64/sys/bus/xen/drivers/vbd/unbind \

-	tests/rhel5-xen-domU-hvm-ia64/sys/bus/xen/drivers/vif/bind \

-	tests/rhel5-xen-domU-hvm-ia64/sys/bus/xen/drivers/vif/unbind \

-	tests/rhel5-xen-domU-hvm-ia64/sys/bus/xen/drivers_probe \

-	tests/rhel5-xen-domU-pv/proc/cpuinfo \

-	tests/rhel5-xen-domU-pv/proc/self/status \

-	tests/rhel5-xen-domU-pv/proc/xen/balloon \

-	tests/rhel5-xen-domU-pv/proc/xen/capabilities \

-	tests/rhel5-xen-domU-pv/proc/xen/privcmd \

-	tests/rhel5-xen-domU-pv/proc/xen/xenbus \

-	tests/rhel5-xen-domU-pv/sbin/dmidecode \

-	tests/rhel5-xen-domU-pv/sbin/uname \

-	tests/rhel5-xen-domU-pv/sbin/virt-what-cpuid-helper \

-	tests/rhel5-xen-domU-pv/sys/hypervisor/properties/pagesize \

-	tests/rhel5-xen-domU-pv/sys/hypervisor/properties/changeset \

-	tests/rhel5-xen-domU-pv/sys/hypervisor/properties/virtual_start \

-	tests/rhel5-xen-domU-pv/sys/hypervisor/properties/capabilities \

-	tests/rhel5-xen-domU-pv/sys/hypervisor/properties/writable_pt \

-	tests/rhel5-xen-domU-pv/sys/hypervisor/type \

-	tests/rhel5-xen-domU-pv/sys/hypervisor/vmcoreinfo \

-	tests/rhel5-xen-domU-pv/sys/hypervisor/version/minor \

-	tests/rhel5-xen-domU-pv/sys/hypervisor/version/major \

-	tests/rhel5-xen-domU-pv/sys/hypervisor/version/extra \

-	tests/rhel5-xen-domU-pv/sys/hypervisor/compilation/compiler \

-	tests/rhel5-xen-domU-pv/sys/hypervisor/compilation/compiled_by \

-	tests/rhel5-xen-domU-pv/sys/hypervisor/compilation/compile_date \

-	tests/rhel5-xen-domU-pv/sys/hypervisor/uuid \

-	tests/rhev/proc/cpuinfo \

-	tests/rhev/proc/self/status \

-	tests/rhev/sbin/dmidecode \

-	tests/rhev/sbin/uname \

-	tests/rhev/sbin/virt-what-cpuid-helper \

-	tests/vmm/proc/cpuinfo \

-	tests/vmm/sbin/dmidecode \

-	tests/vmm/sbin/uname \

-	tests/vmm/sbin/virt-what-cpuid-helper \

-	tests/xen-arm/proc/cpuinfo \

-	tests/xen-arm/proc/device-tree/hypervisor/compatible \

-	tests/xen-arm/proc/self/status \

-	tests/xen-arm/sbin/dmidecode \

-	tests/xen-arm/sbin/uname \

-	tests/xen-arm/sbin/virt-what-cpuid-helper \

-	tests/zvm/proc/cpuinfo \

-	tests/zvm/proc/self/status \

-	tests/zvm/proc/sysinfo \

-	tests/zvm/sbin/dmidecode \

-	tests/zvm/sbin/uname \

-	tests/zvm/sbin/virt-what-cpuid-helper \

-	$(TESTS)

diff --git a/configure.ac b/configure.ac

index 3f16dba..5e0d9c4 100644

--- a/configure.ac

+++ b/configure.ac

@@ -32,10 +32,85 @@ dnl Architecture we are compiling for.

 AC_CANONICAL_HOST

 AM_CONDITIONAL([HOST_CPU_IA64], [ test "x$host_cpu" = "xia64" ])

+dnl List of tests.

+tests="\

+	aws-baremetal-x86 \

+	aws-kvm-arm \

+	aws-kvm-x86 \

+	aws-xen-x86 \

+	baremetal \

+	bhyve \

+	docker \

+	esx4.1 \

+	hyperv \

+	kvm \

+	kvm-explicit-cpu \

+	ldoms \

+	linux-vserver \

+	lkvm \

+	lkvm-arm \

+	lx86 \

+	lxc \

+	parallels-desktop \

+	ppc64-baremetal \

+	ppc64-kvm \

+	ppc64-lpar-dedicated \

+	ppc64-lpar-shared \

+	qemu \

+	qemu-arm \

+	qemu-smbios \

+	qemu-smbios-kvm \

+	rhel5-xen-dom0 \

+	rhel5-xen-domU-hvm \

+	rhel5-xen-domU-hvm-ia64 \

+	rhel5-xen-domU-pv \

+	rhev \

+	vmm \

+	xen-arm \

+	zvm \

+        "

+AC_SUBST([tests])

+

 dnl Produce output files.

 AC_CONFIG_HEADERS([config.h])

 AC_CONFIG_FILES([virt-what],[chmod +x virt-what])

-AC_CONFIG_FILES([Makefile])

+AC_CONFIG_FILES([Makefile

+                 tests/Makefile

+	         tests/aws-baremetal-x86/Makefile

+	         tests/aws-kvm-arm/Makefile

+	         tests/aws-kvm-x86/Makefile

+	         tests/aws-xen-x86/Makefile

+	         tests/baremetal/Makefile

+	         tests/bhyve/Makefile

+	         tests/docker/Makefile

+	         tests/esx4.1/Makefile

+	         tests/hyperv/Makefile

+	         tests/kvm/Makefile

+	         tests/kvm-explicit-cpu/Makefile

+	         tests/ldoms/Makefile

+	         tests/linux-vserver/Makefile

+	         tests/lkvm/Makefile

+	         tests/lkvm-arm/Makefile

+	         tests/lx86/Makefile

+	         tests/lxc/Makefile

+	         tests/parallels-desktop/Makefile

+	         tests/ppc64-baremetal/Makefile

+	         tests/ppc64-kvm/Makefile

+	         tests/ppc64-lpar-dedicated/Makefile

+	         tests/ppc64-lpar-shared/Makefile

+	         tests/qemu/Makefile

+	         tests/qemu-arm/Makefile

+	         tests/qemu-smbios/Makefile

+	         tests/qemu-smbios-kvm/Makefile

+	         tests/rhel5-xen-dom0/Makefile

+	         tests/rhel5-xen-domU-hvm/Makefile

+	         tests/rhel5-xen-domU-hvm-ia64/Makefile

+	         tests/rhel5-xen-domU-pv/Makefile

+	         tests/rhev/Makefile

+	         tests/vmm/Makefile

+	         tests/xen-arm/Makefile

+	         tests/zvm/Makefile

+                 ])

 AC_CHECK_PROG([POD2MAN], [pod2man], [pod2man], [false])

 if test "$POD2MAN" = "false"; then

diff --git a/tests/Makefile.am b/tests/Makefile.am

new file mode 100644

index 0000000..36bf918

--- /dev/null

+++ b/tests/Makefile.am

@@ -0,0 +1,20 @@

+# Makefile for virt-what

+# Copyright (C) 2008-2011 Red Hat Inc.

+#

+# This program is free software; you can redistribute it and/or modify

+# it under the terms of the GNU General Public License as published by

+# the Free Software Foundation; either version 2 of the License, or

+# (at your option) any later version.

+#

+# 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., 675 Mass Ave, Cambridge, MA 02139, USA.

+

+CLEANFILES = *~

+

+SUBDIRS = $(tests)

diff --git a/tests/aws-baremetal-x86/Makefile.am b/tests/aws-baremetal-x86/Makefile.am

new file mode 100644

index 0000000..b748df8

--- /dev/null

+++ b/tests/aws-baremetal-x86/Makefile.am

@@ -0,0 +1,28 @@

+# Makefile for virt-what

+# Copyright (C) 2008-2011 Red Hat Inc.

+#

+# This program is free software; you can redistribute it and/or modify

+# it under the terms of the GNU General Public License as published by

+# the Free Software Foundation; either version 2 of the License, or

+# (at your option) any later version.

+#

+# 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., 675 Mass Ave, Cambridge, MA 02139, USA.

+

+CLEANFILES = *~

+

+TESTS = test.sh

+

+EXTRA_DIST = \

+	test.sh \

+	proc/cpuinfo \

+	proc/self/status \

+	sbin/dmidecode \

+	sbin/uname \

+	sbin/virt-what-cpuid-helper

diff --git a/tests/test-aws-baremetal-x86.sh b/tests/aws-baremetal-x86/test.sh

similarity index 93%

rename from tests/test-aws-baremetal-x86.sh

rename to tests/aws-baremetal-x86/test.sh

index d456163..4a1e566 100755

--- a/tests/test-aws-baremetal-x86.sh

+++ b/tests/aws-baremetal-x86/test.sh

@@ -15,9 +15,7 @@

 # along with this program; if not, write to the Free Software

 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

-root=tests/aws-baremetal-x86

-

-output="$(./virt-what --test-root=$root 2>&1)"

+output="$(PATH=../..:$PATH virt-what --test-root=. 2>&1)"

 expected="aws"

 if [ "$output" != "$expected" ]; then

diff --git a/tests/aws-kvm-arm/Makefile.am b/tests/aws-kvm-arm/Makefile.am

new file mode 100644

index 0000000..b748df8

--- /dev/null

+++ b/tests/aws-kvm-arm/Makefile.am

@@ -0,0 +1,28 @@

+# Makefile for virt-what

+# Copyright (C) 2008-2011 Red Hat Inc.

+#

+# This program is free software; you can redistribute it and/or modify

+# it under the terms of the GNU General Public License as published by

+# the Free Software Foundation; either version 2 of the License, or

+# (at your option) any later version.

+#

+# 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., 675 Mass Ave, Cambridge, MA 02139, USA.

+

+CLEANFILES = *~

+

+TESTS = test.sh

+

+EXTRA_DIST = \

+	test.sh \

+	proc/cpuinfo \

+	proc/self/status \

+	sbin/dmidecode \

+	sbin/uname \

+	sbin/virt-what-cpuid-helper

diff --git a/tests/test-aws-kvm-arm.sh b/tests/aws-kvm-arm/test.sh

similarity index 94%

rename from tests/test-aws-kvm-arm.sh

rename to tests/aws-kvm-arm/test.sh

index 8875421..5d31995 100755

--- a/tests/test-aws-kvm-arm.sh

+++ b/tests/aws-kvm-arm/test.sh

@@ -15,9 +15,7 @@

 # along with this program; if not, write to the Free Software

 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

-root=tests/aws-kvm-arm

-

-output="$(./virt-what --test-root=$root 2>&1)"

+output="$(PATH=../..:$PATH virt-what --test-root=. 2>&1)"

 # XXX At the moment KVM cannot be detected on this platform.

 # We hope to fix that, but for now the only fact printed is "aws".

 expected="aws"

diff --git a/tests/aws-kvm-x86/Makefile.am b/tests/aws-kvm-x86/Makefile.am

new file mode 100644

index 0000000..b748df8

--- /dev/null

+++ b/tests/aws-kvm-x86/Makefile.am

@@ -0,0 +1,28 @@

+# Makefile for virt-what

+# Copyright (C) 2008-2011 Red Hat Inc.

+#

+# This program is free software; you can redistribute it and/or modify

+# it under the terms of the GNU General Public License as published by

+# the Free Software Foundation; either version 2 of the License, or

+# (at your option) any later version.

+#

+# 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., 675 Mass Ave, Cambridge, MA 02139, USA.

+

+CLEANFILES = *~

+

+TESTS = test.sh

+

+EXTRA_DIST = \

+	test.sh \

+	proc/cpuinfo \

+	proc/self/status \

+	sbin/dmidecode \

+	sbin/uname \

+	sbin/virt-what-cpuid-helper

diff --git a/tests/test-aws-kvm-x86.sh b/tests/aws-kvm-x86/test.sh

similarity index 94%

rename from tests/test-aws-kvm-x86.sh

rename to tests/aws-kvm-x86/test.sh

index db4c19f..133ef13 100755

--- a/tests/test-aws-kvm-x86.sh

+++ b/tests/aws-kvm-x86/test.sh

@@ -15,9 +15,7 @@

 # along with this program; if not, write to the Free Software

 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

-root=tests/aws-kvm-x86

-

-output="$(./virt-what --test-root=$root 2>&1)"

+output="$(PATH=../..:$PATH virt-what --test-root=. 2>&1)"