Add test for VMware with data from ESX 4.1 (thanks Matthew Booth).

diff --git a/Makefile.am b/Makefile.am
index add8678..7ebe9b2 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -34,10 +34,10 @@ virt-what.txt: virt-what.pod
        pod2text $< > $@
 
 TESTS = \
-       tests/test-baremetal.sh
+       tests/test-baremetal.sh \
+       tests/test-esx4.1.sh
 # tests/test-kvm.sh \
 # tests/test-qemu.sh \
 # tests/test-virtualbox.sh \
-# tests/test-vmware.sh \
 # tests/test-xen-dom0.sh \
 # tests/test-xen-domU.sh

diff --git a/tests/esx4.1/proc/cpuinfo b/tests/esx4.1/proc/cpuinfo
new file mode 100644 (file)
index 0000000..402fc09
--- /dev/null
+++ b/tests/esx4.1/proc/cpuinfo
@@ -0,0 +1,19 @@
+processor      : 0
+vendor_id      : GenuineIntel
+cpu family     : 6
+model          : 23
+model name     : Intel(R) Core(TM)2 Duo CPU     E8400  @ 3.00GHz
+stepping       : 10
+cpu MHz                : 2992.482
+cache size     : 6144 KB
+fpu            : yes
+fpu_exception  : yes
+cpuid level    : 13
+wp             : yes
+flags          : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss syscall nx lm constant_tsc up nonstop_tsc pni ssse3 cx16 sse4_1 lahf_lm
+bogomips       : 5984.96
+clflush size   : 64
+cache_alignment        : 64
+address sizes  : 40 bits physical, 48 bits virtual
+power management: [8]
+

diff --git a/tests/esx4.1/sbin/dmidecode b/tests/esx4.1/sbin/dmidecode
new file mode 100755 (executable)
index 0000000..794ee77
--- /dev/null
+++ b/tests/esx4.1/sbin/dmidecode
@@ -0,0 +1,1401 @@
+#!/bin/sh -
+cat <<'EOF'
+# dmidecode 2.10
+SMBIOS 2.4 present.
+98 structures occupying 3699 bytes.
+Table at 0x000E0010.
+
+Handle 0x0000, DMI type 0, 24 bytes
+BIOS Information
+       Vendor: Phoenix Technologies LTD
+       Version: 6.00
+       Release Date: 10/13/2009
+       Address: 0xEA2E0
+       Runtime Size: 89376 bytes
+       ROM Size: 64 kB
+       Characteristics:
+               ISA is supported
+               PCI is supported
+               PC Card (PCMCIA) is supported
+               PNP is supported
+               APM is supported
+               BIOS is upgradeable
+               BIOS shadowing is allowed
+               ESCD support is available
+               USB legacy is supported
+               Smart battery is supported
+               BIOS boot specification is supported
+               Targeted content distribution is supported
+       BIOS Revision: 4.6
+       Firmware Revision: 0.0
+
+Handle 0x0001, DMI type 1, 27 bytes
+System Information
+       Manufacturer: VMware, Inc.
+       Product Name: VMware Virtual Platform
+       Version: None
+       Serial Number: VMware-56 4d bc 2c 0f c9 1f 2a-bd d6 7e 67 43 6b 35 41
+       UUID: 564DBC2C-0FC9-1F2A-BDD6-7E67436B3541
+       Wake-up Type: Power Switch
+       SKU Number: Not Specified
+       Family: Not Specified
+
+Handle 0x0002, DMI type 2, 15 bytes
+Base Board Information
+       Manufacturer: Intel Corporation
+       Product Name: 440BX Desktop Reference Platform
+       Version: None
+       Serial Number: None
+       Asset Tag: Not Specified
+       Features: None
+       Location In Chassis: Not Specified
+       Chassis Handle: 0x0000
+       Type: Unknown
+       Contained Object Handles: 0
+
+Handle 0x0003, DMI type 3, 21 bytes
+Chassis Information
+       Manufacturer: No Enclosure
+       Type: Other
+       Lock: Not Present
+       Version: N/A
+       Serial Number: None
+       Asset Tag: No Asset Tag
+       Boot-up State: Safe
+       Power Supply State: Safe
+       Thermal State: Safe
+       Security Status: None
+       OEM Information: 0x00001234
+       Height: Unspecified
+       Number Of Power Cords: Unspecified
+       Contained Elements: 0
+
+Handle 0x0004, DMI type 4, 35 bytes
+Processor Information
+       Socket Designation: CPU socket #0
+       Type: Central Processor
+       Family: Pentium III
+       Manufacturer: GenuineIntel
+       ID: 7A 06 01 00 FF FB EB 0F
+       Signature: Type 0, Family 6, Model 23, Stepping 10
+       Flags:
+               FPU (Floating-point unit on-chip)
+               VME (Virtual mode extension)
+               DE (Debugging extension)
+               PSE (Page size extension)
+               TSC (Time stamp counter)
+               MSR (Model specific registers)
+               PAE (Physical address extension)
+               MCE (Machine check exception)
+               CX8 (CMPXCHG8 instruction supported)
+               APIC (On-chip APIC hardware supported)
+               SEP (Fast system call)
+               MTRR (Memory type range registers)
+               PGE (Page global enable)
+               MCA (Machine check architecture)
+               CMOV (Conditional move instruction supported)
+               PAT (Page attribute table)
+               PSE-36 (36-bit page size extension)
+               CLFSH (CLFLUSH instruction supported)
+               DS (Debug store)
+               ACPI (ACPI supported)
+               MMX (MMX technology supported)
+               FXSR (Fast floating-point save and restore)
+               SSE (Streaming SIMD extensions)
+               SSE2 (Streaming SIMD extensions 2)
+               SS (Self-snoop)
+       Version: Pentium(R) III
+       Voltage: 3.3 V
+       External Clock: Unknown
+       Max Speed: 30000 MHz
+       Current Speed: 3000 MHz
+       Status: Populated, Enabled
+       Upgrade: ZIF Socket
+       L1 Cache Handle: 0x001C
+       L2 Cache Handle: 0x001D
+       L3 Cache Handle: Not Provided
+       Serial Number: Not Specified
+       Asset Tag: Not Specified
+       Part Number: Not Specified
+
+Handle 0x0005, DMI type 4, 35 bytes
+Processor Information
+       Socket Designation: CPU socket #1
+       Type: Central Processor
+       Family: Unknown
+       Manufacturer: 000000000000
+       ID: 00 00 00 00 00 00 00 00
+       Version: 00000000000000000000000000000000
+       Voltage: 3.3 V
+       External Clock: Unknown
+       Max Speed: 30000 MHz
+       Current Speed: Unknown
+       Status: Unpopulated
+       Upgrade: ZIF Socket
+       L1 Cache Handle: 0x001E
+       L2 Cache Handle: 0x001F
+       L3 Cache Handle: Not Provided
+       Serial Number: Not Specified
+       Asset Tag: Not Specified
+       Part Number: Not Specified
+
+Handle 0x0006, DMI type 4, 35 bytes
+Processor Information
+       Socket Designation: CPU socket #2
+       Type: Central Processor
+       Family: Unknown
+       Manufacturer: 000000000000
+       ID: 00 00 00 00 00 00 00 00
+       Version: 00000000000000000000000000000000
+       Voltage: 3.3 V
+       External Clock: Unknown
+       Max Speed: 30000 MHz
+       Current Speed: Unknown
+       Status: Unpopulated
+       Upgrade: ZIF Socket
+       L1 Cache Handle: 0x0020
+       L2 Cache Handle: 0x0021
+       L3 Cache Handle: Not Provided
+       Serial Number: Not Specified
+       Asset Tag: Not Specified
+       Part Number: Not Specified
+
+Handle 0x0007, DMI type 4, 35 bytes
+Processor Information
+       Socket Designation: CPU socket #3
+       Type: Central Processor
+       Family: Unknown
+       Manufacturer: 000000000000
+       ID: 00 00 00 00 00 00 00 00
+       Version: 00000000000000000000000000000000
+       Voltage: 3.3 V
+       External Clock: Unknown
+       Max Speed: 30000 MHz
+       Current Speed: Unknown
+       Status: Unpopulated
+       Upgrade: ZIF Socket
+       L1 Cache Handle: 0x0022
+       L2 Cache Handle: 0x0023
+       L3 Cache Handle: Not Provided
+       Serial Number: Not Specified
+       Asset Tag: Not Specified
+       Part Number: Not Specified
+
+Handle 0x0008, DMI type 4, 35 bytes
+Processor Information
+       Socket Designation: CPU socket #4
+       Type: Central Processor
+       Family: Unknown
+       Manufacturer: 000000000000
+       ID: 00 00 00 00 00 00 00 00
+       Version: 00000000000000000000000000000000
+       Voltage: 3.3 V
+       External Clock: Unknown
+       Max Speed: 30000 MHz
+       Current Speed: Unknown
+       Status: Unpopulated
+       Upgrade: ZIF Socket
+       L1 Cache Handle: 0x0024
+       L2 Cache Handle: 0x0025
+       L3 Cache Handle: Not Provided
+       Serial Number: Not Specified
+       Asset Tag: Not Specified
+       Part Number: Not Specified
+
+Handle 0x0009, DMI type 4, 35 bytes
+Processor Information
+       Socket Designation: CPU socket #5
+       Type: Central Processor
+       Family: Unknown
+       Manufacturer: 000000000000
+       ID: 00 00 00 00 00 00 00 00
+       Version: 00000000000000000000000000000000
+       Voltage: 3.3 V
+       External Clock: Unknown
+       Max Speed: 30000 MHz
+       Current Speed: Unknown
+       Status: Unpopulated
+       Upgrade: ZIF Socket
+       L1 Cache Handle: 0x0026
+       L2 Cache Handle: 0x0027
+       L3 Cache Handle: Not Provided
+       Serial Number: Not Specified
+       Asset Tag: Not Specified
+       Part Number: Not Specified
+
+Handle 0x000A, DMI type 4, 35 bytes
+Processor Information
+       Socket Designation: CPU socket #6
+       Type: Central Processor
+       Family: Unknown
+       Manufacturer: 000000000000
+       ID: 00 00 00 00 00 00 00 00
+       Version: 00000000000000000000000000000000
+       Voltage: 3.3 V
+       External Clock: Unknown
+       Max Speed: 30000 MHz
+       Current Speed: Unknown
+       Status: Unpopulated
+       Upgrade: ZIF Socket
+       L1 Cache Handle: 0x0028
+       L2 Cache Handle: 0x0029
+       L3 Cache Handle: Not Provided
+       Serial Number: Not Specified
+       Asset Tag: Not Specified
+       Part Number: Not Specified
+
+Handle 0x000B, DMI type 4, 35 bytes
+Processor Information
+       Socket Designation: CPU socket #7
+       Type: Central Processor
+       Family: Unknown
+       Manufacturer: 000000000000
+       ID: 00 00 00 00 00 00 00 00
+       Version: 00000000000000000000000000000000
+       Voltage: 3.3 V
+       External Clock: Unknown
+       Max Speed: 30000 MHz
+       Current Speed: Unknown
+       Status: Unpopulated
+       Upgrade: ZIF Socket
+       L1 Cache Handle: 0x002A
+       L2 Cache Handle: 0x002B
+       L3 Cache Handle: Not Provided
+       Serial Number: Not Specified
+       Asset Tag: Not Specified
+       Part Number: Not Specified
+
+Handle 0x000C, DMI type 5, 46 bytes
+Memory Controller Information
+       Error Detecting Method: None
+       Error Correcting Capabilities:
+               None
+       Supported Interleave: One-way Interleave
+       Current Interleave: One-way Interleave
+       Maximum Memory Module Size: 32768 MB
+       Maximum Total Memory Size: 491520 MB
+       Supported Speeds:
+               70 ns
+               60 ns
+       Supported Memory Types:
+               FPM
+               EDO
+               DIMM
+               SDRAM
+       Memory Module Voltage: 3.3 V
+       Associated Memory Slots: 15
+               0x000D
+               0x000E
+               0x000F
+               0x0010
+               0x0011
+               0x0012
+               0x0013
+               0x0014
+               0x0015
+               0x0016
+               0x0017
+               0x0018
+               0x0019
+               0x001A
+               0x001B
+       Enabled Error Correcting Capabilities:
+               None
+
+Handle 0x000D, DMI type 6, 12 bytes
+Memory Module Information
+       Socket Designation: RAM socket #0
+       Bank Connections: 0
+       Current Speed: Unknown
+       Type: EDO DIMM
+       Installed Size: 256 MB (Single-bank Connection)
+       Enabled Size: 256 MB (Single-bank Connection)
+       Error Status: OK
+
+Handle 0x000E, DMI type 6, 12 bytes
+Memory Module Information
+       Socket Designation: RAM socket #1
+       Bank Connections: 1
+       Current Speed: Unknown
+       Type: EDO DIMM
+       Installed Size: 128 MB (Single-bank Connection)
+       Enabled Size: 128 MB (Single-bank Connection)
+       Error Status: OK
+
+Handle 0x000F, DMI type 6, 12 bytes
+Memory Module Information
+       Socket Designation: RAM socket #2
+       Bank Connections: 2
+       Current Speed: Unknown
+       Type: DIMM
+       Installed Size: Not Installed
+       Enabled Size: Not Installed
+       Error Status: OK
+
+Handle 0x0010, DMI type 6, 12 bytes
+Memory Module Information
+       Socket Designation: RAM socket #3
+       Bank Connections: 3
+       Current Speed: Unknown
+       Type: DIMM
+       Installed Size: Not Installed
+       Enabled Size: Not Installed
+       Error Status: OK
+
+Handle 0x0011, DMI type 6, 12 bytes
+Memory Module Information
+       Socket Designation: RAM socket #4
+       Bank Connections: 4
+       Current Speed: Unknown
+       Type: DIMM
+       Installed Size: Not Installed
+       Enabled Size: Not Installed
+       Error Status: OK
+
+Handle 0x0012, DMI type 6, 12 bytes
+Memory Module Information
+       Socket Designation: RAM socket #5
+       Bank Connections: 5
+       Current Speed: Unknown
+       Type: DIMM
+       Installed Size: Not Installed
+       Enabled Size: Not Installed
+       Error Status: OK
+
+Handle 0x0013, DMI type 6, 12 bytes
+Memory Module Information
+       Socket Designation: RAM socket #6
+       Bank Connections: 6
+       Current Speed: Unknown
+       Type: DIMM
+       Installed Size: Not Installed
+       Enabled Size: Not Installed
+       Error Status: OK
+
+Handle 0x0014, DMI type 6, 12 bytes
+Memory Module Information
+       Socket Designation: RAM socket #7
+       Bank Connections: 7
+       Current Speed: Unknown
+       Type: DIMM
+       Installed Size: Not Installed
+       Enabled Size: Not Installed
+       Error Status: OK
+
+Handle 0x0015, DMI type 6, 12 bytes
+Memory Module Information
+       Socket Designation: RAM socket #8
+       Bank Connections: 8
+       Current Speed: Unknown
+       Type: DIMM
+       Installed Size: Not Installed
+       Enabled Size: Not Installed
+       Error Status: OK
+
+Handle 0x0016, DMI type 6, 12 bytes
+Memory Module Information
+       Socket Designation: RAM socket #9
+       Bank Connections: 9
+       Current Speed: Unknown
+       Type: DIMM
+       Installed Size: Not Installed
+       Enabled Size: Not Installed
+       Error Status: OK
+
+Handle 0x0017, DMI type 6, 12 bytes
+Memory Module Information
+       Socket Designation: RAM socket #10
+       Bank Connections: 10
+       Current Speed: Unknown
+       Type: DIMM
+       Installed Size: Not Installed
+       Enabled Size: Not Installed
+       Error Status: OK
+
+Handle 0x0018, DMI type 6, 12 bytes
+Memory Module Information
+       Socket Designation: RAM socket #11
+       Bank Connections: 11
+       Current Speed: Unknown
+       Type: DIMM
+       Installed Size: Not Installed
+       Enabled Size: Not Installed
+       Error Status: OK
+
+Handle 0x0019, DMI type 6, 12 bytes
+Memory Module Information
+       Socket Designation: RAM socket #12
+       Bank Connections: 12
+       Current Speed: Unknown
+       Type: DIMM
+       Installed Size: Not Installed
+       Enabled Size: Not Installed
+       Error Status: OK
+
+Handle 0x001A, DMI type 6, 12 bytes
+Memory Module Information
+       Socket Designation: RAM socket #13
+       Bank Connections: 13
+       Current Speed: Unknown
+       Type: DIMM
+       Installed Size: Not Installed
+       Enabled Size: Not Installed
+       Error Status: OK
+
+Handle 0x001B, DMI type 6, 12 bytes
+Memory Module Information
+       Socket Designation: RAM socket #14
+       Bank Connections: 14
+       Current Speed: Unknown
+       Type: DIMM
+       Installed Size: Not Installed
+       Enabled Size: Not Installed
+       Error Status: OK
+
+Handle 0x001C, DMI type 7, 19 bytes
+Cache Information
+       Socket Designation: L1 Cache
+       Configuration: Enabled, Socketed, Level 1
+       Operational Mode: Write Back
+       Location: Internal
+       Installed Size: 16 kB
+       Maximum Size: 16 kB
+       Supported SRAM Types:
+               Burst
+               Pipeline Burst
+               Asynchronous
+       Installed SRAM Type: Asynchronous
+       Speed: Unknown
+       Error Correction Type: Unknown
+       System Type: Unknown
+       Associativity: Unknown
+
+Handle 0x001D, DMI type 7, 19 bytes
+Cache Information
+       Socket Designation: L2 Cache
+       Configuration: Disabled, Socketed, Level 2
+       Operational Mode: Write Back
+       Location: External
+       Installed Size: 0 kB
+       Maximum Size: 512 kB
+       Supported SRAM Types:
+               Burst
+               Pipeline Burst
+               Asynchronous
+       Installed SRAM Type: None
+       Speed: Unknown
+       Error Correction Type: Unknown
+       System Type: Unknown
+       Associativity: Unknown
+
+Handle 0x001E, DMI type 7, 19 bytes
+Cache Information
+       Socket Designation: L1 Cache
+       Configuration: Enabled, Socketed, Level 1
+       Operational Mode: Write Back
+       Location: Internal
+       Installed Size: 16 kB
+       Maximum Size: 16 kB
+       Supported SRAM Types:
+               Burst
+               Pipeline Burst
+               Asynchronous
+       Installed SRAM Type: Asynchronous
+       Speed: Unknown
+       Error Correction Type: Unknown
+       System Type: Unknown
+       Associativity: Unknown
+
+Handle 0x001F, DMI type 7, 19 bytes
+Cache Information
+       Socket Designation: L2 Cache
+       Configuration: Disabled, Socketed, Level 2
+       Operational Mode: Write Back
+       Location: External
+       Installed Size: 0 kB
+       Maximum Size: 512 kB
+       Supported SRAM Types:
+               Burst
+               Pipeline Burst
+               Asynchronous
+       Installed SRAM Type: None
+       Speed: Unknown
+       Error Correction Type: Unknown
+       System Type: Unknown
+       Associativity: Unknown
+
+Handle 0x0020, DMI type 7, 19 bytes
+Cache Information
+       Socket Designation: L1 Cache
+       Configuration: Enabled, Socketed, Level 1
+       Operational Mode: Write Back
+       Location: Internal
+       Installed Size: 16 kB
+       Maximum Size: 16 kB
+       Supported SRAM Types:
+               Burst
+               Pipeline Burst
+               Asynchronous
+       Installed SRAM Type: Asynchronous
+       Speed: Unknown
+       Error Correction Type: Unknown
+       System Type: Unknown
+       Associativity: Unknown
+
+Handle 0x0021, DMI type 7, 19 bytes
+Cache Information
+       Socket Designation: L2 Cache
+       Configuration: Disabled, Socketed, Level 2
+       Operational Mode: Write Back
+       Location: External
+       Installed Size: 0 kB
+       Maximum Size: 512 kB
+       Supported SRAM Types:
+               Burst
+               Pipeline Burst
+               Asynchronous
+       Installed SRAM Type: None
+       Speed: Unknown
+       Error Correction Type: Unknown
+       System Type: Unknown
+       Associativity: Unknown
+
+Handle 0x0022, DMI type 7, 19 bytes
+Cache Information
+       Socket Designation: L1 Cache
+       Configuration: Enabled, Socketed, Level 1
+       Operational Mode: Write Back
+       Location: Internal
+       Installed Size: 16 kB
+       Maximum Size: 16 kB
+       Supported SRAM Types:
+               Burst
+               Pipeline Burst
+               Asynchronous
+       Installed SRAM Type: Asynchronous
+       Speed: Unknown
+       Error Correction Type: Unknown
+       System Type: Unknown
+       Associativity: Unknown
+
+Handle 0x0023, DMI type 7, 19 bytes
+Cache Information
+       Socket Designation: L2 Cache
+       Configuration: Disabled, Socketed, Level 2
+       Operational Mode: Write Back
+       Location: External
+       Installed Size: 0 kB
+       Maximum Size: 512 kB
+       Supported SRAM Types:
+               Burst
+               Pipeline Burst
+               Asynchronous
+       Installed SRAM Type: None
+       Speed: Unknown
+       Error Correction Type: Unknown
+       System Type: Unknown
+       Associativity: Unknown
+
+Handle 0x0024, DMI type 7, 19 bytes
+Cache Information
+       Socket Designation: L1 Cache
+       Configuration: Enabled, Socketed, Level 1
+       Operational Mode: Write Back
+       Location: Internal
+       Installed Size: 16 kB
+       Maximum Size: 16 kB
+       Supported SRAM Types:
+               Burst
+               Pipeline Burst
+               Asynchronous
+       Installed SRAM Type: Asynchronous
+       Speed: Unknown
+       Error Correction Type: Unknown
+       System Type: Unknown
+       Associativity: Unknown
+
+Handle 0x0025, DMI type 7, 19 bytes
+Cache Information
+       Socket Designation: L2 Cache
+       Configuration: Disabled, Socketed, Level 2
+       Operational Mode: Write Back
+       Location: External
+       Installed Size: 0 kB
+       Maximum Size: 512 kB
+       Supported SRAM Types:
+               Burst
+               Pipeline Burst
+               Asynchronous
+       Installed SRAM Type: None
+       Speed: Unknown
+       Error Correction Type: Unknown
+       System Type: Unknown
+       Associativity: Unknown
+
+Handle 0x0026, DMI type 7, 19 bytes
+Cache Information
+       Socket Designation: L1 Cache
+       Configuration: Enabled, Socketed, Level 1
+       Operational Mode: Write Back
+       Location: Internal
+       Installed Size: 16 kB
+       Maximum Size: 16 kB
+       Supported SRAM Types:
+               Burst
+               Pipeline Burst
+               Asynchronous
+       Installed SRAM Type: Asynchronous
+       Speed: Unknown
+       Error Correction Type: Unknown
+       System Type: Unknown
+       Associativity: Unknown
+
+Handle 0x0027, DMI type 7, 19 bytes
+Cache Information
+       Socket Designation: L2 Cache
+       Configuration: Disabled, Socketed, Level 2
+       Operational Mode: Write Back
+       Location: External
+       Installed Size: 0 kB
+       Maximum Size: 512 kB
+       Supported SRAM Types:
+               Burst
+               Pipeline Burst
+               Asynchronous
+       Installed SRAM Type: None
+       Speed: Unknown
+       Error Correction Type: Unknown
+       System Type: Unknown
+       Associativity: Unknown
+
+Handle 0x0028, DMI type 7, 19 bytes
+Cache Information
+       Socket Designation: L1 Cache
+       Configuration: Enabled, Socketed, Level 1
+       Operational Mode: Write Back
+       Location: Internal
+       Installed Size: 16 kB
+       Maximum Size: 16 kB
+       Supported SRAM Types:
+               Burst
+               Pipeline Burst
+               Asynchronous
+       Installed SRAM Type: Asynchronous
+       Speed: Unknown
+       Error Correction Type: Unknown
+       System Type: Unknown
+       Associativity: Unknown
+
+Handle 0x0029, DMI type 7, 19 bytes
+Cache Information
+       Socket Designation: L2 Cache
+       Configuration: Disabled, Socketed, Level 2
+       Operational Mode: Write Back
+       Location: External
+       Installed Size: 0 kB
+       Maximum Size: 512 kB
+       Supported SRAM Types:
+               Burst
+               Pipeline Burst
+               Asynchronous
+       Installed SRAM Type: None
+       Speed: Unknown
+       Error Correction Type: Unknown
+       System Type: Unknown
+       Associativity: Unknown
+
+Handle 0x002A, DMI type 7, 19 bytes
+Cache Information
+       Socket Designation: L1 Cache
+       Configuration: Enabled, Socketed, Level 1
+       Operational Mode: Write Back
+       Location: Internal
+       Installed Size: 16 kB
+       Maximum Size: 16 kB
+       Supported SRAM Types:
+               Burst
+               Pipeline Burst
+               Asynchronous
+       Installed SRAM Type: Asynchronous
+       Speed: Unknown
+       Error Correction Type: Unknown
+       System Type: Unknown
+       Associativity: Unknown
+
+Handle 0x002B, DMI type 7, 19 bytes
+Cache Information
+       Socket Designation: L2 Cache
+       Configuration: Disabled, Socketed, Level 2
+       Operational Mode: Write Back
+       Location: External
+       Installed Size: 0 kB
+       Maximum Size: 512 kB
+       Supported SRAM Types:
+               Burst
+               Pipeline Burst
+               Asynchronous
+       Installed SRAM Type: None
+       Speed: Unknown
+       Error Correction Type: Unknown
+       System Type: Unknown
+       Associativity: Unknown
+
+Handle 0x002C, DMI type 8, 9 bytes
+Port Connector Information
+       Internal Reference Designator: J19
+       Internal Connector Type: 9 Pin Dual Inline (pin 10 cut)
+       External Reference Designator: COM 1
+       External Connector Type: DB-9 male
+       Port Type: Serial Port 16550A Compatible
+
+Handle 0x002D, DMI type 8, 9 bytes
+Port Connector Information
+       Internal Reference Designator: J23
+       Internal Connector Type: 25 Pin Dual Inline (pin 26 cut)
+       External Reference Designator: Parallel
+       External Connector Type: DB-25 female
+       Port Type: Parallel Port ECP/EPP
+
+Handle 0x002E, DMI type 8, 9 bytes
+Port Connector Information
+       Internal Reference Designator: J11
+       Internal Connector Type: None
+       External Reference Designator: Keyboard
+       External Connector Type: Circular DIN-8 male
+       Port Type: Keyboard Port
+
+Handle 0x002F, DMI type 8, 9 bytes
+Port Connector Information
+       Internal Reference Designator: J12
+       Internal Connector Type: None
+       External Reference Designator: PS/2 Mouse
+       External Connector Type: Circular DIN-8 male
+       Port Type: Keyboard Port
+
+Handle 0x0030, DMI type 9, 13 bytes
+System Slot Information
+       Designation: ISA Slot J8
+       Type: 16-bit ISA
+       Current Usage: Unknown
+       Length: Short
+       Characteristics:
+               5.0 V is provided
+
+Handle 0x0031, DMI type 9, 13 bytes
+System Slot Information
+       Designation: ISA Slot J9
+       Type: 16-bit ISA
+       Current Usage: Unknown
+       Length: Short
+       Characteristics:
+               5.0 V is provided
+
+Handle 0x0032, DMI type 9, 13 bytes
+System Slot Information
+       Designation: ISA Slot J10
+       Type: 16-bit ISA
+       Current Usage: Unknown
+       Length: Short
+       Characteristics:
+               5.0 V is provided
+
+Handle 0x0033, DMI type 9, 13 bytes
+System Slot Information
+       Designation: PCI Slot J11
+       Type: 32-bit PCI
+       Current Usage: In Use
+       Length: Long
+       ID: 1
+       Characteristics:
+               5.0 V is provided
+               3.3 V is provided
+
+Handle 0x0034, DMI type 9, 13 bytes
+System Slot Information
+       Designation: PCI Slot J12
+       Type: 32-bit PCI
+       Current Usage: In Use
+       Length: Long
+       ID: 2
+       Characteristics:
+               5.0 V is provided
+               3.3 V is provided
+
+Handle 0x0035, DMI type 9, 13 bytes
+System Slot Information
+       Designation: PCI Slot J13
+       Type: 32-bit PCI
+       Current Usage: In Use
+       Length: Long
+       ID: 3
+       Characteristics:
+               5.0 V is provided
+               3.3 V is provided
+
+Handle 0x0036, DMI type 9, 13 bytes
+System Slot Information
+       Designation: PCI Slot J14
+       Type: 32-bit PCI
+       Current Usage: Available
+       Length: Long
+       ID: 4
+       Characteristics:
+               5.0 V is provided
+               3.3 V is provided
+
+Handle 0x0037, DMI type 10, 8 bytes
+On Board Device 1 Information
+       Type: Video
+       Status: Disabled
+       Description: VMware SVGA II
+On Board Device 2 Information
+       Type: Sound
+       Status: Disabled
+       Description: ES1371
+
+Handle 0x0038, DMI type 11, 5 bytes
+OEM Strings
+       String 1: [MS_VM_CERT/SHA1/27d66596a61c48dd3dc7216fd715126e33f59ae7]
+       String 2: Welcome to the Virtual Machine
+
+Handle 0x0039, DMI type 15, 29 bytes
+System Event Log
+       Area Length: 16 bytes
+       Header Start Offset: 0x0000
+       Header Length: 16 bytes
+       Data Start Offset: 0x0010
+       Access Method: General-purpose non-volatile data functions
+       Access Address: 0x0000
+       Status: Invalid, Full
+       Change Token: 0x00000036
+       Header Format: Type 1
+       Supported Log Type Descriptors: 3
+       Descriptor 1: POST error
+       Data Format 1: POST results bitmap
+       Descriptor 2: Single-bit ECC memory error
+       Data Format 2: Multiple-event
+       Descriptor 3: Multi-bit ECC memory error
+       Data Format 3: Multiple-event
+
+Handle 0x003A, DMI type 16, 15 bytes
+Physical Memory Array
+       Location: System Board Or Motherboard
+       Use: System Memory
+       Error Correction Type: None
+       Maximum Capacity: 256 GB
+       Error Information Handle: Not Provided
+       Number Of Devices: 15
+
+Handle 0x003B, DMI type 17, 27 bytes
+Memory Device
+       Array Handle: 0x003A
+       Error Information Handle: No Error
+       Total Width: 32 bits
+       Data Width: 32 bits
+       Size: 256 MB
+       Form Factor: DIMM
+       Set: None
+       Locator: RAM slot #0
+       Bank Locator: RAM slot #0
+       Type: DRAM
+       Type Detail: EDO
+       Speed: Unknown
+       Manufacturer: Not Specified
+       Serial Number: Not Specified
+       Asset Tag: Not Specified
+       Part Number: Not Specified
+
+Handle 0x003C, DMI type 17, 27 bytes
+Memory Device
+       Array Handle: 0x003A
+       Error Information Handle: No Error
+       Total Width: 32 bits
+       Data Width: 32 bits
+       Size: 128 MB
+       Form Factor: DIMM
+       Set: None
+       Locator: RAM slot #1
+       Bank Locator: RAM slot #1
+       Type: DRAM
+       Type Detail: EDO
+       Speed: Unknown
+       Manufacturer: Not Specified
+       Serial Number: Not Specified
+       Asset Tag: Not Specified
+       Part Number: Not Specified
+
+Handle 0x003D, DMI type 17, 27 bytes
+Memory Device
+       Array Handle: 0x003A
+       Error Information Handle: No Error
+       Total Width: Unknown
+       Data Width: Unknown
+       Size: No Module Installed
+       Form Factor: DIMM
+       Set: None
+       Locator: RAM slot #2
+       Bank Locator: RAM slot #2
+       Type: DRAM
+       Type Detail: Unknown
+       Speed: Unknown
+       Manufacturer: Not Specified
+       Serial Number: Not Specified
+       Asset Tag: Not Specified
+       Part Number: Not Specified
+
+Handle 0x003E, DMI type 17, 27 bytes
+Memory Device
+       Array Handle: 0x003A
+       Error Information Handle: No Error
+       Total Width: Unknown
+       Data Width: Unknown
+       Size: No Module Installed
+       Form Factor: DIMM
+       Set: None
+       Locator: RAM slot #3
+       Bank Locator: RAM slot #3
+       Type: DRAM
+       Type Detail: Unknown
+       Speed: Unknown
+       Manufacturer: Not Specified
+       Serial Number: Not Specified
+       Asset Tag: Not Specified
+       Part Number: Not Specified
+
+Handle 0x003F, DMI type 17, 27 bytes
+Memory Device
+       Array Handle: 0x003A
+       Error Information Handle: No Error
+       Total Width: Unknown
+       Data Width: Unknown
+       Size: No Module Installed
+       Form Factor: DIMM
+       Set: None
+       Locator: RAM slot #4
+       Bank Locator: RAM slot #4
+       Type: DRAM
+       Type Detail: Unknown
+       Speed: Unknown
+       Manufacturer: Not Specified
+       Serial Number: Not Specified
+       Asset Tag: Not Specified
+       Part Number: Not Specified
+
+Handle 0x0040, DMI type 17, 27 bytes
+Memory Device
+       Array Handle: 0x003A
+       Error Information Handle: No Error
+       Total Width: Unknown
+       Data Width: Unknown
+       Size: No Module Installed
+       Form Factor: DIMM
+       Set: None
+       Locator: RAM slot #5
+       Bank Locator: RAM slot #5
+       Type: DRAM
+       Type Detail: Unknown
+       Speed: Unknown
+       Manufacturer: Not Specified
+       Serial Number: Not Specified
+       Asset Tag: Not Specified
+       Part Number: Not Specified
+
+Handle 0x0041, DMI type 17, 27 bytes
+Memory Device
+       Array Handle: 0x003A
+       Error Information Handle: No Error
+       Total Width: Unknown
+       Data Width: Unknown
+       Size: No Module Installed
+       Form Factor: DIMM
+       Set: None
+       Locator: RAM slot #6
+       Bank Locator: RAM slot #6
+       Type: DRAM
+       Type Detail: Unknown
+       Speed: Unknown
+       Manufacturer: Not Specified
+       Serial Number: Not Specified
+       Asset Tag: Not Specified
+       Part Number: Not Specified
+
+Handle 0x0042, DMI type 17, 27 bytes
+Memory Device
+       Array Handle: 0x003A
+       Error Information Handle: No Error
+       Total Width: Unknown
+       Data Width: Unknown
+       Size: No Module Installed
+       Form Factor: DIMM
+       Set: None
+       Locator: RAM slot #7
+       Bank Locator: RAM slot #7
+       Type: DRAM
+       Type Detail: Unknown
+       Speed: Unknown
+       Manufacturer: Not Specified
+       Serial Number: Not Specified
+       Asset Tag: Not Specified
+       Part Number: Not Specified
+
+Handle 0x0043, DMI type 17, 27 bytes
+Memory Device
+       Array Handle: 0x003A
+       Error Information Handle: No Error
+       Total Width: Unknown
+       Data Width: Unknown
+       Size: No Module Installed
+       Form Factor: DIMM
+       Set: None
+       Locator: RAM slot #8
+       Bank Locator: RAM slot #8
+       Type: DRAM
+       Type Detail: Unknown
+       Speed: Unknown
+       Manufacturer: Not Specified
+       Serial Number: Not Specified
+       Asset Tag: Not Specified
+       Part Number: Not Specified
+
+Handle 0x0044, DMI type 17, 27 bytes
+Memory Device
+       Array Handle: 0x003A
+       Error Information Handle: No Error
+       Total Width: Unknown
+       Data Width: Unknown
+       Size: No Module Installed
+       Form Factor: DIMM
+       Set: None
+       Locator: RAM slot #9
+       Bank Locator: RAM slot #9
+       Type: DRAM
+       Type Detail: Unknown
+       Speed: Unknown
+       Manufacturer: Not Specified
+       Serial Number: Not Specified
+       Asset Tag: Not Specified
+       Part Number: Not Specified
+
+Handle 0x0045, DMI type 17, 27 bytes
+Memory Device
+       Array Handle: 0x003A
+       Error Information Handle: No Error
+       Total Width: Unknown
+       Data Width: Unknown
+       Size: No Module Installed
+       Form Factor: DIMM
+       Set: None
+       Locator: RAM slot #10
+       Bank Locator: RAM slot #10
+       Type: DRAM
+       Type Detail: Unknown
+       Speed: Unknown
+       Manufacturer: Not Specified
+       Serial Number: Not Specified
+       Asset Tag: Not Specified
+       Part Number: Not Specified
+
+Handle 0x0046, DMI type 17, 27 bytes
+Memory Device
+       Array Handle: 0x003A
+       Error Information Handle: No Error
+       Total Width: Unknown
+       Data Width: Unknown
+       Size: No Module Installed
+       Form Factor: DIMM
+       Set: None
+       Locator: RAM slot #11
+       Bank Locator: RAM slot #11
+       Type: DRAM
+       Type Detail: Unknown
+       Speed: Unknown
+       Manufacturer: Not Specified
+       Serial Number: Not Specified
+       Asset Tag: Not Specified
+       Part Number: Not Specified
+
+Handle 0x0047, DMI type 17, 27 bytes
+Memory Device
+       Array Handle: 0x003A
+       Error Information Handle: No Error
+       Total Width: Unknown
+       Data Width: Unknown
+       Size: No Module Installed
+       Form Factor: DIMM
+       Set: None
+       Locator: RAM slot #12
+       Bank Locator: RAM slot #12
+       Type: DRAM
+       Type Detail: Unknown
+       Speed: Unknown
+       Manufacturer: Not Specified
+       Serial Number: Not Specified
+       Asset Tag: Not Specified
+       Part Number: Not Specified
+
+Handle 0x0048, DMI type 17, 27 bytes
+Memory Device
+       Array Handle: 0x003A
+       Error Information Handle: No Error
+       Total Width: Unknown
+       Data Width: Unknown
+       Size: No Module Installed
+       Form Factor: DIMM
+       Set: None
+       Locator: RAM slot #13
+       Bank Locator: RAM slot #13
+       Type: DRAM
+       Type Detail: Unknown
+       Speed: Unknown
+       Manufacturer: Not Specified
+       Serial Number: Not Specified
+       Asset Tag: Not Specified
+       Part Number: Not Specified
+
+Handle 0x0049, DMI type 17, 27 bytes
+Memory Device
+       Array Handle: 0x003A
+       Error Information Handle: No Error
+       Total Width: Unknown
+       Data Width: Unknown
+       Size: No Module Installed
+       Form Factor: DIMM
+       Set: None
+       Locator: RAM slot #14
+       Bank Locator: RAM slot #14
+       Type: DRAM
+       Type Detail: Unknown
+       Speed: Unknown
+       Manufacturer: Not Specified
+       Serial Number: Not Specified
+       Asset Tag: Not Specified
+       Part Number: Not Specified
+
+Handle 0x004A, DMI type 18, 23 bytes
+32-bit Memory Error Information
+       Type: OK
+       Granularity: Unknown
+       Operation: Unknown
+       Vendor Syndrome: Unknown
+       Memory Array Address: Unknown
+       Device Address: Unknown
+       Resolution: Unknown
+
+Handle 0x004B, DMI type 19, 15 bytes
+Memory Array Mapped Address
+       Starting Address: 0x00000000000
+       Ending Address: 0x00017FFFFFF
+       Range Size: 384 MB
+       Physical Array Handle: 0x003A
+       Partition Width: 0
+
+Handle 0x004C, DMI type 20, 19 bytes
+Memory Device Mapped Address
+       Starting Address: 0x00000000000
+       Ending Address: 0x0000FFFFFFF
+       Range Size: 256 MB
+       Physical Device Handle: 0x003B
+       Memory Array Mapped Address Handle: 0x004B
+       Partition Row Position: Unknown
+       Interleave Position: Unknown
+       Interleaved Data Depth: Unknown
+
+Handle 0x004D, DMI type 20, 19 bytes
+Memory Device Mapped Address
+       Starting Address: 0x00010000000
+       Ending Address: 0x00017FFFFFF
+       Range Size: 128 MB
+       Physical Device Handle: 0x003C
+       Memory Array Mapped Address Handle: 0x004B
+       Partition Row Position: Unknown
+       Interleave Position: Unknown
+       Interleaved Data Depth: Unknown
+
+Handle 0x004E, DMI type 20, 19 bytes
+Memory Device Mapped Address
+       Starting Address: 0x00017FFFC00
+       Ending Address: 0x00017FFFFFF
+       Range Size: 1 kB
+       Physical Device Handle: 0x003D
+       Memory Array Mapped Address Handle: 0x004B
+       Partition Row Position: Unknown
+       Interleave Position: Unknown
+       Interleaved Data Depth: Unknown
+
+Handle 0x004F, DMI type 20, 19 bytes
+Memory Device Mapped Address
+       Starting Address: 0x00017FFFC00
+       Ending Address: 0x00017FFFFFF
+       Range Size: 1 kB
+       Physical Device Handle: 0x003E
+       Memory Array Mapped Address Handle: 0x004B
+       Partition Row Position: Unknown
+       Interleave Position: Unknown
+       Interleaved Data Depth: Unknown
+
+Handle 0x0050, DMI type 20, 19 bytes
+Memory Device Mapped Address
+       Starting Address: 0x00017FFFC00
+       Ending Address: 0x00017FFFFFF
+       Range Size: 1 kB
+       Physical Device Handle: 0x003F
+       Memory Array Mapped Address Handle: 0x004B
+       Partition Row Position: Unknown
+       Interleave Position: Unknown
+       Interleaved Data Depth: Unknown
+
+Handle 0x0051, DMI type 20, 19 bytes
+Memory Device Mapped Address
+       Starting Address: 0x00017FFFC00
+       Ending Address: 0x00017FFFFFF
+       Range Size: 1 kB
+       Physical Device Handle: 0x0040
+       Memory Array Mapped Address Handle: 0x004B
+       Partition Row Position: Unknown
+       Interleave Position: Unknown
+       Interleaved Data Depth: Unknown
+
+Handle 0x0052, DMI type 20, 19 bytes
+Memory Device Mapped Address
+       Starting Address: 0x00017FFFC00
+       Ending Address: 0x00017FFFFFF
+       Range Size: 1 kB
+       Physical Device Handle: 0x0041
+       Memory Array Mapped Address Handle: 0x004B
+       Partition Row Position: Unknown
+       Interleave Position: Unknown
+       Interleaved Data Depth: Unknown
+
+Handle 0x0053, DMI type 20, 19 bytes
+Memory Device Mapped Address
+       Starting Address: 0x00017FFFC00
+       Ending Address: 0x00017FFFFFF
+       Range Size: 1 kB
+       Physical Device Handle: 0x0042
+       Memory Array Mapped Address Handle: 0x004B
+       Partition Row Position: Unknown
+       Interleave Position: Unknown
+       Interleaved Data Depth: Unknown
+
+Handle 0x0054, DMI type 20, 19 bytes
+Memory Device Mapped Address
+       Starting Address: 0x00017FFFC00
+       Ending Address: 0x00017FFFFFF
+       Range Size: 1 kB
+       Physical Device Handle: 0x0043
+       Memory Array Mapped Address Handle: 0x004B
+       Partition Row Position: Unknown
+       Interleave Position: Unknown
+       Interleaved Data Depth: Unknown
+
+Handle 0x0055, DMI type 20, 19 bytes
+Memory Device Mapped Address
+       Starting Address: 0x00017FFFC00
+       Ending Address: 0x00017FFFFFF
+       Range Size: 1 kB
+       Physical Device Handle: 0x0044
+       Memory Array Mapped Address Handle: 0x004B
+       Partition Row Position: Unknown
+       Interleave Position: Unknown
+       Interleaved Data Depth: Unknown
+
+Handle 0x0056, DMI type 20, 19 bytes
+Memory Device Mapped Address
+       Starting Address: 0x00017FFFC00
+       Ending Address: 0x00017FFFFFF
+       Range Size: 1 kB
+       Physical Device Handle: 0x0045
+       Memory Array Mapped Address Handle: 0x004B
+       Partition Row Position: Unknown
+       Interleave Position: Unknown
+       Interleaved Data Depth: Unknown
+
+Handle 0x0057, DMI type 20, 19 bytes
+Memory Device Mapped Address
+       Starting Address: 0x00017FFFC00
+       Ending Address: 0x00017FFFFFF
+       Range Size: 1 kB
+       Physical Device Handle: 0x0046
+       Memory Array Mapped Address Handle: 0x004B
+       Partition Row Position: Unknown
+       Interleave Position: Unknown
+       Interleaved Data Depth: Unknown
+
+Handle 0x0058, DMI type 20, 19 bytes
+Memory Device Mapped Address
+       Starting Address: 0x00017FFFC00
+       Ending Address: 0x00017FFFFFF
+       Range Size: 1 kB
+       Physical Device Handle: 0x0047
+       Memory Array Mapped Address Handle: 0x004B
+       Partition Row Position: Unknown
+       Interleave Position: Unknown
+       Interleaved Data Depth: Unknown
+
+Handle 0x0059, DMI type 20, 19 bytes
+Memory Device Mapped Address
+       Starting Address: 0x00017FFFC00
+       Ending Address: 0x00017FFFFFF
+       Range Size: 1 kB
+       Physical Device Handle: 0x0048
+       Memory Array Mapped Address Handle: 0x004B
+       Partition Row Position: Unknown
+       Interleave Position: Unknown
+       Interleaved Data Depth: Unknown
+
+Handle 0x005A, DMI type 20, 19 bytes
+Memory Device Mapped Address
+       Starting Address: 0x00017FFFC00
+       Ending Address: 0x00017FFFFFF
+       Range Size: 1 kB
+       Physical Device Handle: 0x0049
+       Memory Array Mapped Address Handle: 0x004B
+       Partition Row Position: Unknown
+       Interleave Position: Unknown
+       Interleaved Data Depth: Unknown
+
+Handle 0x005B, DMI type 23, 13 bytes
+System Reset
+       Status: Enabled
+       Watchdog Timer: Present
+       Boot Option: Do Not Reboot
+       Boot Option On Limit: Do Not Reboot
+       Reset Count: Unknown
+       Reset Limit: Unknown
+       Timer Interval: Unknown
+       Timeout: Unknown
+
+Handle 0x005C, DMI type 24, 5 bytes
+Hardware Security
+       Power-On Password Status: Disabled
+       Keyboard Password Status: Unknown
+       Administrator Password Status: Enabled
+       Front Panel Reset Status: Unknown
+
+Handle 0x005D, DMI type 30, 6 bytes
+Out-of-band Remote Access
+       Manufacturer Name: Intel
+       Inbound Connection: Enabled
+       Outbound Connection: Disabled
+
+Handle 0x005E, DMI type 32, 20 bytes
+System Boot Information
+       Status: <OUT OF SPEC>
+
+Handle 0x005F, DMI type 33, 31 bytes
+64-bit Memory Error Information
+       Type: OK
+       Granularity: Unknown
+       Operation: Unknown
+       Vendor Syndrome: Unknown
+       Memory Array Address: 0x0000000080000000
+       Device Address: 0x0000000080000000
+       Resolution: Unknown
+
+Handle 0x0060, DMI type 126, 4 bytes
+Inactive
+
+Handle 0x0061, DMI type 127, 4 bytes
+End Of Table
+
+EOF

diff --git a/tests/esx4.1/sbin/id b/tests/esx4.1/sbin/id
new file mode 100755 (executable)
index 0000000..6c704ac
--- /dev/null
+++ b/tests/esx4.1/sbin/id
@@ -0,0 +1,2 @@
+#!/bin/sh -
+echo 0

diff --git a/tests/esx4.1/sbin/virt-what-cpuid-helper b/tests/esx4.1/sbin/virt-what-cpuid-helper
new file mode 100755 (executable)
index 0000000..61f1bd6
--- /dev/null
+++ b/tests/esx4.1/sbin/virt-what-cpuid-helper
@@ -0,0 +1,2 @@
+#!/bin/sh -
+echo VMwareVMware

diff --git a/tests/test-esx4.1.sh b/tests/test-esx4.1.sh
new file mode 100755 (executable)
index 0000000..35c4e1d
--- /dev/null
+++ b/tests/test-esx4.1.sh
@@ -0,0 +1,35 @@
+# Test for ESX 4.1
+# Data supplied by Matthew Booth.
+# 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.
+
+root=tests/esx4.1
+
+output="$(./virt-what --test-root=$root 2>&1)"
+expected="vmware"
+
+if [ "$output" != "$expected" ]; then
+    echo "$0: test failed because output did not match expected"
+    echo "Expected output was:"
+    echo "----------------------------------------"
+    echo "$expected"
+    echo "----------------------------------------"
+    echo "But the actual output of the program was:"
+    echo "----------------------------------------"
+    echo "$output"
+    echo "----------------------------------------"
+    exit 1
+fi