diff --git a/tests/vmx2xmldata/vmx2xml-annotation.vmx b/tests/vmx2xmldata/annotation.vmx similarity index 100% rename from tests/vmx2xmldata/vmx2xml-annotation.vmx rename to tests/vmx2xmldata/annotation.vmx diff --git a/tests/vmx2xmldata/vmx2xml-annotation.xml b/tests/vmx2xmldata/annotation.xml similarity index 100% rename from tests/vmx2xmldata/vmx2xml-annotation.xml rename to tests/vmx2xmldata/annotation.xml diff --git a/tests/vmx2xmldata/vmx2xml-case-insensitive-1.vmx b/tests/vmx2xmldata/case-insensitive-1.vmx similarity index 100% rename from tests/vmx2xmldata/vmx2xml-case-insensitive-1.vmx rename to tests/vmx2xmldata/case-insensitive-1.vmx diff --git a/tests/vmx2xmldata/vmx2xml-case-insensitive-1.xml b/tests/vmx2xmldata/case-insensitive-1.xml similarity index 100% rename from tests/vmx2xmldata/vmx2xml-case-insensitive-1.xml rename to tests/vmx2xmldata/case-insensitive-1.xml diff --git a/tests/vmx2xmldata/vmx2xml-case-insensitive-2.vmx b/tests/vmx2xmldata/case-insensitive-2.vmx similarity index 100% rename from tests/vmx2xmldata/vmx2xml-case-insensitive-2.vmx rename to tests/vmx2xmldata/case-insensitive-2.vmx diff --git a/tests/vmx2xmldata/vmx2xml-case-insensitive-2.xml b/tests/vmx2xmldata/case-insensitive-2.xml similarity index 100% rename from tests/vmx2xmldata/vmx2xml-case-insensitive-2.xml rename to tests/vmx2xmldata/case-insensitive-2.xml diff --git a/tests/vmx2xmldata/vmx2xml-cdrom-ide-device.vmx b/tests/vmx2xmldata/cdrom-ide-device.vmx similarity index 100% rename from tests/vmx2xmldata/vmx2xml-cdrom-ide-device.vmx rename to tests/vmx2xmldata/cdrom-ide-device.vmx diff --git a/tests/vmx2xmldata/vmx2xml-cdrom-ide-device.xml b/tests/vmx2xmldata/cdrom-ide-device.xml similarity index 100% rename from tests/vmx2xmldata/vmx2xml-cdrom-ide-device.xml rename to tests/vmx2xmldata/cdrom-ide-device.xml diff --git a/tests/vmx2xmldata/vmx2xml-cdrom-ide-empty-2.vmx b/tests/vmx2xmldata/cdrom-ide-empty-2.vmx similarity index 100% rename from tests/vmx2xmldata/vmx2xml-cdrom-ide-empty-2.vmx rename to tests/vmx2xmldata/cdrom-ide-empty-2.vmx diff --git a/tests/vmx2xmldata/vmx2xml-cdrom-ide-empty-2.xml b/tests/vmx2xmldata/cdrom-ide-empty-2.xml similarity index 100% rename from tests/vmx2xmldata/vmx2xml-cdrom-ide-empty-2.xml rename to tests/vmx2xmldata/cdrom-ide-empty-2.xml diff --git a/tests/vmx2xmldata/vmx2xml-cdrom-ide-empty.vmx b/tests/vmx2xmldata/cdrom-ide-empty.vmx similarity index 100% rename from tests/vmx2xmldata/vmx2xml-cdrom-ide-empty.vmx rename to tests/vmx2xmldata/cdrom-ide-empty.vmx diff --git a/tests/vmx2xmldata/vmx2xml-cdrom-ide-empty.xml b/tests/vmx2xmldata/cdrom-ide-empty.xml similarity index 100% rename from tests/vmx2xmldata/vmx2xml-cdrom-ide-empty.xml rename to tests/vmx2xmldata/cdrom-ide-empty.xml diff --git a/tests/vmx2xmldata/vmx2xml-cdrom-ide-file-missing-datastore.vmx b/tests/vmx2xmldata/cdrom-ide-file-missing-datastore.vmx similarity index 100% rename from tests/vmx2xmldata/vmx2xml-cdrom-ide-file-missing-datastore.vmx rename to tests/vmx2xmldata/cdrom-ide-file-missing-datastore.vmx diff --git a/tests/vmx2xmldata/cdrom-ide-file-missing-datastore.xml b/tests/vmx2xmldata/cdrom-ide-file-missing-datastore.xml new file mode 120000 index 0000000000..da582d2bda --- /dev/null +++ b/tests/vmx2xmldata/cdrom-ide-file-missing-datastore.xml @@ -0,0 +1 @@ +cdrom-ide-empty.xml \ No newline at end of file diff --git a/tests/vmx2xmldata/vmx2xml-cdrom-ide-file-missing-file.vmx b/tests/vmx2xmldata/cdrom-ide-file-missing-file.vmx similarity index 100% rename from tests/vmx2xmldata/vmx2xml-cdrom-ide-file-missing-file.vmx rename to tests/vmx2xmldata/cdrom-ide-file-missing-file.vmx diff --git a/tests/vmx2xmldata/cdrom-ide-file-missing-file.xml b/tests/vmx2xmldata/cdrom-ide-file-missing-file.xml new file mode 120000 index 0000000000..da582d2bda --- /dev/null +++ b/tests/vmx2xmldata/cdrom-ide-file-missing-file.xml @@ -0,0 +1 @@ +cdrom-ide-empty.xml \ No newline at end of file diff --git a/tests/vmx2xmldata/vmx2xml-cdrom-ide-file.vmx b/tests/vmx2xmldata/cdrom-ide-file.vmx similarity index 100% rename from tests/vmx2xmldata/vmx2xml-cdrom-ide-file.vmx rename to tests/vmx2xmldata/cdrom-ide-file.vmx diff --git a/tests/vmx2xmldata/vmx2xml-cdrom-ide-file.xml b/tests/vmx2xmldata/cdrom-ide-file.xml similarity index 100% rename from tests/vmx2xmldata/vmx2xml-cdrom-ide-file.xml rename to tests/vmx2xmldata/cdrom-ide-file.xml diff --git a/tests/vmx2xmldata/vmx2xml-cdrom-ide-raw-auto-detect.vmx b/tests/vmx2xmldata/cdrom-ide-raw-auto-detect.vmx similarity index 100% rename from tests/vmx2xmldata/vmx2xml-cdrom-ide-raw-auto-detect.vmx rename to tests/vmx2xmldata/cdrom-ide-raw-auto-detect.vmx diff --git a/tests/vmx2xmldata/vmx2xml-cdrom-ide-raw-auto-detect.xml b/tests/vmx2xmldata/cdrom-ide-raw-auto-detect.xml similarity index 100% rename from tests/vmx2xmldata/vmx2xml-cdrom-ide-raw-auto-detect.xml rename to tests/vmx2xmldata/cdrom-ide-raw-auto-detect.xml diff --git a/tests/vmx2xmldata/vmx2xml-cdrom-ide-raw-device.vmx b/tests/vmx2xmldata/cdrom-ide-raw-device.vmx similarity index 100% rename from tests/vmx2xmldata/vmx2xml-cdrom-ide-raw-device.vmx rename to tests/vmx2xmldata/cdrom-ide-raw-device.vmx diff --git a/tests/vmx2xmldata/vmx2xml-cdrom-ide-raw-device.xml b/tests/vmx2xmldata/cdrom-ide-raw-device.xml similarity index 100% rename from tests/vmx2xmldata/vmx2xml-cdrom-ide-raw-device.xml rename to tests/vmx2xmldata/cdrom-ide-raw-device.xml diff --git a/tests/vmx2xmldata/vmx2xml-cdrom-scsi-device.vmx b/tests/vmx2xmldata/cdrom-scsi-device.vmx similarity index 100% rename from tests/vmx2xmldata/vmx2xml-cdrom-scsi-device.vmx rename to tests/vmx2xmldata/cdrom-scsi-device.vmx diff --git a/tests/vmx2xmldata/vmx2xml-cdrom-scsi-device.xml b/tests/vmx2xmldata/cdrom-scsi-device.xml similarity index 100% rename from tests/vmx2xmldata/vmx2xml-cdrom-scsi-device.xml rename to tests/vmx2xmldata/cdrom-scsi-device.xml diff --git a/tests/vmx2xmldata/vmx2xml-cdrom-scsi-empty.vmx b/tests/vmx2xmldata/cdrom-scsi-empty.vmx similarity index 100% rename from tests/vmx2xmldata/vmx2xml-cdrom-scsi-empty.vmx rename to tests/vmx2xmldata/cdrom-scsi-empty.vmx diff --git a/tests/vmx2xmldata/vmx2xml-cdrom-scsi-empty.xml b/tests/vmx2xmldata/cdrom-scsi-empty.xml similarity index 100% rename from tests/vmx2xmldata/vmx2xml-cdrom-scsi-empty.xml rename to tests/vmx2xmldata/cdrom-scsi-empty.xml diff --git a/tests/vmx2xmldata/vmx2xml-cdrom-scsi-file.vmx b/tests/vmx2xmldata/cdrom-scsi-file.vmx similarity index 100% rename from tests/vmx2xmldata/vmx2xml-cdrom-scsi-file.vmx rename to tests/vmx2xmldata/cdrom-scsi-file.vmx diff --git a/tests/vmx2xmldata/vmx2xml-cdrom-scsi-file.xml b/tests/vmx2xmldata/cdrom-scsi-file.xml similarity index 100% rename from tests/vmx2xmldata/vmx2xml-cdrom-scsi-file.xml rename to tests/vmx2xmldata/cdrom-scsi-file.xml diff --git a/tests/vmx2xmldata/vmx2xml-cdrom-scsi-passthru.vmx b/tests/vmx2xmldata/cdrom-scsi-passthru.vmx similarity index 100% rename from tests/vmx2xmldata/vmx2xml-cdrom-scsi-passthru.vmx rename to tests/vmx2xmldata/cdrom-scsi-passthru.vmx diff --git a/tests/vmx2xmldata/vmx2xml-cdrom-scsi-passthru.xml b/tests/vmx2xmldata/cdrom-scsi-passthru.xml similarity index 100% rename from tests/vmx2xmldata/vmx2xml-cdrom-scsi-passthru.xml rename to tests/vmx2xmldata/cdrom-scsi-passthru.xml diff --git a/tests/vmx2xmldata/vmx2xml-cdrom-scsi-raw-auto-detect.vmx b/tests/vmx2xmldata/cdrom-scsi-raw-auto-detect.vmx similarity index 100% rename from tests/vmx2xmldata/vmx2xml-cdrom-scsi-raw-auto-detect.vmx rename to tests/vmx2xmldata/cdrom-scsi-raw-auto-detect.vmx diff --git a/tests/vmx2xmldata/vmx2xml-cdrom-scsi-raw-auto-detect.xml b/tests/vmx2xmldata/cdrom-scsi-raw-auto-detect.xml similarity index 100% rename from tests/vmx2xmldata/vmx2xml-cdrom-scsi-raw-auto-detect.xml rename to tests/vmx2xmldata/cdrom-scsi-raw-auto-detect.xml diff --git a/tests/vmx2xmldata/vmx2xml-cdrom-scsi-raw-device.vmx b/tests/vmx2xmldata/cdrom-scsi-raw-device.vmx similarity index 100% rename from tests/vmx2xmldata/vmx2xml-cdrom-scsi-raw-device.vmx rename to tests/vmx2xmldata/cdrom-scsi-raw-device.vmx diff --git a/tests/vmx2xmldata/vmx2xml-cdrom-scsi-raw-device.xml b/tests/vmx2xmldata/cdrom-scsi-raw-device.xml similarity index 100% rename from tests/vmx2xmldata/vmx2xml-cdrom-scsi-raw-device.xml rename to tests/vmx2xmldata/cdrom-scsi-raw-device.xml diff --git a/tests/vmx2xmldata/vmx2xml-datacenterpath.vmx b/tests/vmx2xmldata/datacenterpath.vmx similarity index 100% rename from tests/vmx2xmldata/vmx2xml-datacenterpath.vmx rename to tests/vmx2xmldata/datacenterpath.vmx diff --git a/tests/vmx2xmldata/vmx2xml-datacenterpath.xml b/tests/vmx2xmldata/datacenterpath.xml similarity index 100% rename from tests/vmx2xmldata/vmx2xml-datacenterpath.xml rename to tests/vmx2xmldata/datacenterpath.xml diff --git a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-1.vmx b/tests/vmx2xmldata/esx-in-the-wild-1.vmx similarity index 100% rename from tests/vmx2xmldata/vmx2xml-esx-in-the-wild-1.vmx rename to tests/vmx2xmldata/esx-in-the-wild-1.vmx diff --git a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-1.xml b/tests/vmx2xmldata/esx-in-the-wild-1.xml similarity index 100% rename from tests/vmx2xmldata/vmx2xml-esx-in-the-wild-1.xml rename to tests/vmx2xmldata/esx-in-the-wild-1.xml diff --git a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-10.vmx b/tests/vmx2xmldata/esx-in-the-wild-10.vmx similarity index 100% rename from tests/vmx2xmldata/vmx2xml-esx-in-the-wild-10.vmx rename to tests/vmx2xmldata/esx-in-the-wild-10.vmx diff --git a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-10.xml b/tests/vmx2xmldata/esx-in-the-wild-10.xml similarity index 100% rename from tests/vmx2xmldata/vmx2xml-esx-in-the-wild-10.xml rename to tests/vmx2xmldata/esx-in-the-wild-10.xml diff --git a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-11.vmx b/tests/vmx2xmldata/esx-in-the-wild-11.vmx similarity index 100% rename from tests/vmx2xmldata/vmx2xml-esx-in-the-wild-11.vmx rename to tests/vmx2xmldata/esx-in-the-wild-11.vmx diff --git a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-11.xml b/tests/vmx2xmldata/esx-in-the-wild-11.xml similarity index 100% rename from tests/vmx2xmldata/vmx2xml-esx-in-the-wild-11.xml rename to tests/vmx2xmldata/esx-in-the-wild-11.xml diff --git a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-2.vmx b/tests/vmx2xmldata/esx-in-the-wild-2.vmx similarity index 100% rename from tests/vmx2xmldata/vmx2xml-esx-in-the-wild-2.vmx rename to tests/vmx2xmldata/esx-in-the-wild-2.vmx diff --git a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-2.xml b/tests/vmx2xmldata/esx-in-the-wild-2.xml similarity index 100% rename from tests/vmx2xmldata/vmx2xml-esx-in-the-wild-2.xml rename to tests/vmx2xmldata/esx-in-the-wild-2.xml diff --git a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-3.vmx b/tests/vmx2xmldata/esx-in-the-wild-3.vmx similarity index 100% rename from tests/vmx2xmldata/vmx2xml-esx-in-the-wild-3.vmx rename to tests/vmx2xmldata/esx-in-the-wild-3.vmx diff --git a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-3.xml b/tests/vmx2xmldata/esx-in-the-wild-3.xml similarity index 100% rename from tests/vmx2xmldata/vmx2xml-esx-in-the-wild-3.xml rename to tests/vmx2xmldata/esx-in-the-wild-3.xml diff --git a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-4.vmx b/tests/vmx2xmldata/esx-in-the-wild-4.vmx similarity index 100% rename from tests/vmx2xmldata/vmx2xml-esx-in-the-wild-4.vmx rename to tests/vmx2xmldata/esx-in-the-wild-4.vmx diff --git a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-4.xml b/tests/vmx2xmldata/esx-in-the-wild-4.xml similarity index 100% rename from tests/vmx2xmldata/vmx2xml-esx-in-the-wild-4.xml rename to tests/vmx2xmldata/esx-in-the-wild-4.xml diff --git a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-5.vmx b/tests/vmx2xmldata/esx-in-the-wild-5.vmx similarity index 100% rename from tests/vmx2xmldata/vmx2xml-esx-in-the-wild-5.vmx rename to tests/vmx2xmldata/esx-in-the-wild-5.vmx diff --git a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-5.xml b/tests/vmx2xmldata/esx-in-the-wild-5.xml similarity index 100% rename from tests/vmx2xmldata/vmx2xml-esx-in-the-wild-5.xml rename to tests/vmx2xmldata/esx-in-the-wild-5.xml diff --git a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-6.vmx b/tests/vmx2xmldata/esx-in-the-wild-6.vmx similarity index 100% rename from tests/vmx2xmldata/vmx2xml-esx-in-the-wild-6.vmx rename to tests/vmx2xmldata/esx-in-the-wild-6.vmx diff --git a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-6.xml b/tests/vmx2xmldata/esx-in-the-wild-6.xml similarity index 100% rename from tests/vmx2xmldata/vmx2xml-esx-in-the-wild-6.xml rename to tests/vmx2xmldata/esx-in-the-wild-6.xml diff --git a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-7.vmx b/tests/vmx2xmldata/esx-in-the-wild-7.vmx similarity index 100% rename from tests/vmx2xmldata/vmx2xml-esx-in-the-wild-7.vmx rename to tests/vmx2xmldata/esx-in-the-wild-7.vmx diff --git a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-7.xml b/tests/vmx2xmldata/esx-in-the-wild-7.xml similarity index 100% rename from tests/vmx2xmldata/vmx2xml-esx-in-the-wild-7.xml rename to tests/vmx2xmldata/esx-in-the-wild-7.xml diff --git a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-8.vmx b/tests/vmx2xmldata/esx-in-the-wild-8.vmx similarity index 100% rename from tests/vmx2xmldata/vmx2xml-esx-in-the-wild-8.vmx rename to tests/vmx2xmldata/esx-in-the-wild-8.vmx diff --git a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-8.xml b/tests/vmx2xmldata/esx-in-the-wild-8.xml similarity index 100% rename from tests/vmx2xmldata/vmx2xml-esx-in-the-wild-8.xml rename to tests/vmx2xmldata/esx-in-the-wild-8.xml diff --git a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-9.vmx b/tests/vmx2xmldata/esx-in-the-wild-9.vmx similarity index 100% rename from tests/vmx2xmldata/vmx2xml-esx-in-the-wild-9.vmx rename to tests/vmx2xmldata/esx-in-the-wild-9.vmx diff --git a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-9.xml b/tests/vmx2xmldata/esx-in-the-wild-9.xml similarity index 100% rename from tests/vmx2xmldata/vmx2xml-esx-in-the-wild-9.xml rename to tests/vmx2xmldata/esx-in-the-wild-9.xml diff --git a/tests/vmx2xmldata/vmx2xml-ethernet-bridged.vmx b/tests/vmx2xmldata/ethernet-bridged.vmx similarity index 100% rename from tests/vmx2xmldata/vmx2xml-ethernet-bridged.vmx rename to tests/vmx2xmldata/ethernet-bridged.vmx diff --git a/tests/vmx2xmldata/vmx2xml-ethernet-bridged.xml b/tests/vmx2xmldata/ethernet-bridged.xml similarity index 100% rename from tests/vmx2xmldata/vmx2xml-ethernet-bridged.xml rename to tests/vmx2xmldata/ethernet-bridged.xml diff --git a/tests/vmx2xmldata/vmx2xml-ethernet-custom.vmx b/tests/vmx2xmldata/ethernet-custom.vmx similarity index 100% rename from tests/vmx2xmldata/vmx2xml-ethernet-custom.vmx rename to tests/vmx2xmldata/ethernet-custom.vmx diff --git a/tests/vmx2xmldata/vmx2xml-ethernet-custom.xml b/tests/vmx2xmldata/ethernet-custom.xml similarity index 100% rename from tests/vmx2xmldata/vmx2xml-ethernet-custom.xml rename to tests/vmx2xmldata/ethernet-custom.xml diff --git a/tests/vmx2xmldata/vmx2xml-ethernet-e1000.vmx b/tests/vmx2xmldata/ethernet-e1000.vmx similarity index 100% rename from tests/vmx2xmldata/vmx2xml-ethernet-e1000.vmx rename to tests/vmx2xmldata/ethernet-e1000.vmx diff --git a/tests/vmx2xmldata/vmx2xml-ethernet-e1000.xml b/tests/vmx2xmldata/ethernet-e1000.xml similarity index 100% rename from tests/vmx2xmldata/vmx2xml-ethernet-e1000.xml rename to tests/vmx2xmldata/ethernet-e1000.xml diff --git a/tests/vmx2xmldata/vmx2xml-ethernet-generated.vmx b/tests/vmx2xmldata/ethernet-generated.vmx similarity index 100% rename from tests/vmx2xmldata/vmx2xml-ethernet-generated.vmx rename to tests/vmx2xmldata/ethernet-generated.vmx diff --git a/tests/vmx2xmldata/vmx2xml-ethernet-generated.xml b/tests/vmx2xmldata/ethernet-generated.xml similarity index 100% rename from tests/vmx2xmldata/vmx2xml-ethernet-generated.xml rename to tests/vmx2xmldata/ethernet-generated.xml diff --git a/tests/vmx2xmldata/vmx2xml-ethernet-nat.vmx b/tests/vmx2xmldata/ethernet-nat.vmx similarity index 100% rename from tests/vmx2xmldata/vmx2xml-ethernet-nat.vmx rename to tests/vmx2xmldata/ethernet-nat.vmx diff --git a/tests/vmx2xmldata/vmx2xml-ethernet-nat.xml b/tests/vmx2xmldata/ethernet-nat.xml similarity index 100% rename from tests/vmx2xmldata/vmx2xml-ethernet-nat.xml rename to tests/vmx2xmldata/ethernet-nat.xml diff --git a/tests/vmx2xmldata/vmx2xml-ethernet-other.vmx b/tests/vmx2xmldata/ethernet-other.vmx similarity index 100% rename from tests/vmx2xmldata/vmx2xml-ethernet-other.vmx rename to tests/vmx2xmldata/ethernet-other.vmx diff --git a/tests/vmx2xmldata/vmx2xml-ethernet-other.xml b/tests/vmx2xmldata/ethernet-other.xml similarity index 100% rename from tests/vmx2xmldata/vmx2xml-ethernet-other.xml rename to tests/vmx2xmldata/ethernet-other.xml diff --git a/tests/vmx2xmldata/vmx2xml-ethernet-static.vmx b/tests/vmx2xmldata/ethernet-static.vmx similarity index 100% rename from tests/vmx2xmldata/vmx2xml-ethernet-static.vmx rename to tests/vmx2xmldata/ethernet-static.vmx diff --git a/tests/vmx2xmldata/vmx2xml-ethernet-static.xml b/tests/vmx2xmldata/ethernet-static.xml similarity index 100% rename from tests/vmx2xmldata/vmx2xml-ethernet-static.xml rename to tests/vmx2xmldata/ethernet-static.xml diff --git a/tests/vmx2xmldata/vmx2xml-ethernet-vmxnet2.vmx b/tests/vmx2xmldata/ethernet-vmxnet2.vmx similarity index 100% rename from tests/vmx2xmldata/vmx2xml-ethernet-vmxnet2.vmx rename to tests/vmx2xmldata/ethernet-vmxnet2.vmx diff --git a/tests/vmx2xmldata/vmx2xml-ethernet-vmxnet2.xml b/tests/vmx2xmldata/ethernet-vmxnet2.xml similarity index 100% rename from tests/vmx2xmldata/vmx2xml-ethernet-vmxnet2.xml rename to tests/vmx2xmldata/ethernet-vmxnet2.xml diff --git a/tests/vmx2xmldata/vmx2xml-ethernet-vpx.vmx b/tests/vmx2xmldata/ethernet-vpx.vmx similarity index 100% rename from tests/vmx2xmldata/vmx2xml-ethernet-vpx.vmx rename to tests/vmx2xmldata/ethernet-vpx.vmx diff --git a/tests/vmx2xmldata/vmx2xml-ethernet-vpx.xml b/tests/vmx2xmldata/ethernet-vpx.xml similarity index 100% rename from tests/vmx2xmldata/vmx2xml-ethernet-vpx.xml rename to tests/vmx2xmldata/ethernet-vpx.xml diff --git a/tests/vmx2xmldata/vmx2xml-firmware-efi.vmx b/tests/vmx2xmldata/firmware-efi.vmx similarity index 100% rename from tests/vmx2xmldata/vmx2xml-firmware-efi.vmx rename to tests/vmx2xmldata/firmware-efi.vmx diff --git a/tests/vmx2xmldata/vmx2xml-firmware-efi.xml b/tests/vmx2xmldata/firmware-efi.xml similarity index 100% rename from tests/vmx2xmldata/vmx2xml-firmware-efi.xml rename to tests/vmx2xmldata/firmware-efi.xml diff --git a/tests/vmx2xmldata/vmx2xml-floppy-device.vmx b/tests/vmx2xmldata/floppy-device.vmx similarity index 100% rename from tests/vmx2xmldata/vmx2xml-floppy-device.vmx rename to tests/vmx2xmldata/floppy-device.vmx diff --git a/tests/vmx2xmldata/vmx2xml-floppy-device.xml b/tests/vmx2xmldata/floppy-device.xml similarity index 100% rename from tests/vmx2xmldata/vmx2xml-floppy-device.xml rename to tests/vmx2xmldata/floppy-device.xml diff --git a/tests/vmx2xmldata/vmx2xml-floppy-file.vmx b/tests/vmx2xmldata/floppy-file.vmx similarity index 100% rename from tests/vmx2xmldata/vmx2xml-floppy-file.vmx rename to tests/vmx2xmldata/floppy-file.vmx diff --git a/tests/vmx2xmldata/vmx2xml-floppy-file.xml b/tests/vmx2xmldata/floppy-file.xml similarity index 100% rename from tests/vmx2xmldata/vmx2xml-floppy-file.xml rename to tests/vmx2xmldata/floppy-file.xml diff --git a/tests/vmx2xmldata/vmx2xml-fusion-in-the-wild-1.vmx b/tests/vmx2xmldata/fusion-in-the-wild-1.vmx similarity index 100% rename from tests/vmx2xmldata/vmx2xml-fusion-in-the-wild-1.vmx rename to tests/vmx2xmldata/fusion-in-the-wild-1.vmx diff --git a/tests/vmx2xmldata/vmx2xml-fusion-in-the-wild-1.xml b/tests/vmx2xmldata/fusion-in-the-wild-1.xml similarity index 100% rename from tests/vmx2xmldata/vmx2xml-fusion-in-the-wild-1.xml rename to tests/vmx2xmldata/fusion-in-the-wild-1.xml diff --git a/tests/vmx2xmldata/vmx2xml-graphics-vnc.vmx b/tests/vmx2xmldata/graphics-vnc.vmx similarity index 100% rename from tests/vmx2xmldata/vmx2xml-graphics-vnc.vmx rename to tests/vmx2xmldata/graphics-vnc.vmx diff --git a/tests/vmx2xmldata/vmx2xml-graphics-vnc.xml b/tests/vmx2xmldata/graphics-vnc.xml similarity index 100% rename from tests/vmx2xmldata/vmx2xml-graphics-vnc.xml rename to tests/vmx2xmldata/graphics-vnc.xml diff --git a/tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-1.vmx b/tests/vmx2xmldata/gsx-in-the-wild-1.vmx similarity index 100% rename from tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-1.vmx rename to tests/vmx2xmldata/gsx-in-the-wild-1.vmx diff --git a/tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-1.xml b/tests/vmx2xmldata/gsx-in-the-wild-1.xml similarity index 100% rename from tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-1.xml rename to tests/vmx2xmldata/gsx-in-the-wild-1.xml diff --git a/tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-2.vmx b/tests/vmx2xmldata/gsx-in-the-wild-2.vmx similarity index 100% rename from tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-2.vmx rename to tests/vmx2xmldata/gsx-in-the-wild-2.vmx diff --git a/tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-2.xml b/tests/vmx2xmldata/gsx-in-the-wild-2.xml similarity index 100% rename from tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-2.xml rename to tests/vmx2xmldata/gsx-in-the-wild-2.xml diff --git a/tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-3.vmx b/tests/vmx2xmldata/gsx-in-the-wild-3.vmx similarity index 100% rename from tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-3.vmx rename to tests/vmx2xmldata/gsx-in-the-wild-3.vmx diff --git a/tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-3.xml b/tests/vmx2xmldata/gsx-in-the-wild-3.xml similarity index 100% rename from tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-3.xml rename to tests/vmx2xmldata/gsx-in-the-wild-3.xml diff --git a/tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-4.vmx b/tests/vmx2xmldata/gsx-in-the-wild-4.vmx similarity index 100% rename from tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-4.vmx rename to tests/vmx2xmldata/gsx-in-the-wild-4.vmx diff --git a/tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-4.xml b/tests/vmx2xmldata/gsx-in-the-wild-4.xml similarity index 100% rename from tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-4.xml rename to tests/vmx2xmldata/gsx-in-the-wild-4.xml diff --git a/tests/vmx2xmldata/vmx2xml-harddisk-ide-file-missing-datastore.vmx b/tests/vmx2xmldata/harddisk-ide-file-missing-datastore.vmx similarity index 100% rename from tests/vmx2xmldata/vmx2xml-harddisk-ide-file-missing-datastore.vmx rename to tests/vmx2xmldata/harddisk-ide-file-missing-datastore.vmx diff --git a/tests/vmx2xmldata/vmx2xml-harddisk-ide-file.vmx b/tests/vmx2xmldata/harddisk-ide-file.vmx similarity index 100% rename from tests/vmx2xmldata/vmx2xml-harddisk-ide-file.vmx rename to tests/vmx2xmldata/harddisk-ide-file.vmx diff --git a/tests/vmx2xmldata/vmx2xml-harddisk-ide-file.xml b/tests/vmx2xmldata/harddisk-ide-file.xml similarity index 100% rename from tests/vmx2xmldata/vmx2xml-harddisk-ide-file.xml rename to tests/vmx2xmldata/harddisk-ide-file.xml diff --git a/tests/vmx2xmldata/vmx2xml-harddisk-scsi-file-missing-file.vmx b/tests/vmx2xmldata/harddisk-scsi-file-missing-file.vmx similarity index 100% rename from tests/vmx2xmldata/vmx2xml-harddisk-scsi-file-missing-file.vmx rename to tests/vmx2xmldata/harddisk-scsi-file-missing-file.vmx diff --git a/tests/vmx2xmldata/vmx2xml-harddisk-scsi-file.vmx b/tests/vmx2xmldata/harddisk-scsi-file.vmx similarity index 100% rename from tests/vmx2xmldata/vmx2xml-harddisk-scsi-file.vmx rename to tests/vmx2xmldata/harddisk-scsi-file.vmx diff --git a/tests/vmx2xmldata/vmx2xml-harddisk-scsi-file.xml b/tests/vmx2xmldata/harddisk-scsi-file.xml similarity index 100% rename from tests/vmx2xmldata/vmx2xml-harddisk-scsi-file.xml rename to tests/vmx2xmldata/harddisk-scsi-file.xml diff --git a/tests/vmx2xmldata/vmx2xml-harddisk-transient.vmx b/tests/vmx2xmldata/harddisk-transient.vmx similarity index 100% rename from tests/vmx2xmldata/vmx2xml-harddisk-transient.vmx rename to tests/vmx2xmldata/harddisk-transient.vmx diff --git a/tests/vmx2xmldata/vmx2xml-harddisk-transient.xml b/tests/vmx2xmldata/harddisk-transient.xml similarity index 100% rename from tests/vmx2xmldata/vmx2xml-harddisk-transient.xml rename to tests/vmx2xmldata/harddisk-transient.xml diff --git a/tests/vmx2xmldata/vmx2xml-minimal-64bit.vmx b/tests/vmx2xmldata/minimal-64bit.vmx similarity index 100% rename from tests/vmx2xmldata/vmx2xml-minimal-64bit.vmx rename to tests/vmx2xmldata/minimal-64bit.vmx diff --git a/tests/vmx2xmldata/vmx2xml-minimal-64bit.xml b/tests/vmx2xmldata/minimal-64bit.xml similarity index 100% rename from tests/vmx2xmldata/vmx2xml-minimal-64bit.xml rename to tests/vmx2xmldata/minimal-64bit.xml diff --git a/tests/vmx2xmldata/vmx2xml-minimal.vmx b/tests/vmx2xmldata/minimal.vmx similarity index 100% rename from tests/vmx2xmldata/vmx2xml-minimal.vmx rename to tests/vmx2xmldata/minimal.vmx diff --git a/tests/vmx2xmldata/vmx2xml-minimal.xml b/tests/vmx2xmldata/minimal.xml similarity index 100% rename from tests/vmx2xmldata/vmx2xml-minimal.xml rename to tests/vmx2xmldata/minimal.xml diff --git a/tests/vmx2xmldata/vmx2xml-parallel-device.vmx b/tests/vmx2xmldata/parallel-device.vmx similarity index 100% rename from tests/vmx2xmldata/vmx2xml-parallel-device.vmx rename to tests/vmx2xmldata/parallel-device.vmx diff --git a/tests/vmx2xmldata/vmx2xml-parallel-device.xml b/tests/vmx2xmldata/parallel-device.xml similarity index 100% rename from tests/vmx2xmldata/vmx2xml-parallel-device.xml rename to tests/vmx2xmldata/parallel-device.xml diff --git a/tests/vmx2xmldata/vmx2xml-parallel-file.vmx b/tests/vmx2xmldata/parallel-file.vmx similarity index 100% rename from tests/vmx2xmldata/vmx2xml-parallel-file.vmx rename to tests/vmx2xmldata/parallel-file.vmx diff --git a/tests/vmx2xmldata/vmx2xml-parallel-file.xml b/tests/vmx2xmldata/parallel-file.xml similarity index 100% rename from tests/vmx2xmldata/vmx2xml-parallel-file.xml rename to tests/vmx2xmldata/parallel-file.xml diff --git a/tests/vmx2xmldata/vmx2xml-scsi-driver.vmx b/tests/vmx2xmldata/scsi-driver.vmx similarity index 100% rename from tests/vmx2xmldata/vmx2xml-scsi-driver.vmx rename to tests/vmx2xmldata/scsi-driver.vmx diff --git a/tests/vmx2xmldata/vmx2xml-scsi-driver.xml b/tests/vmx2xmldata/scsi-driver.xml similarity index 100% rename from tests/vmx2xmldata/vmx2xml-scsi-driver.xml rename to tests/vmx2xmldata/scsi-driver.xml diff --git a/tests/vmx2xmldata/vmx2xml-scsi-writethrough.vmx b/tests/vmx2xmldata/scsi-writethrough.vmx similarity index 100% rename from tests/vmx2xmldata/vmx2xml-scsi-writethrough.vmx rename to tests/vmx2xmldata/scsi-writethrough.vmx diff --git a/tests/vmx2xmldata/vmx2xml-scsi-writethrough.xml b/tests/vmx2xmldata/scsi-writethrough.xml similarity index 100% rename from tests/vmx2xmldata/vmx2xml-scsi-writethrough.xml rename to tests/vmx2xmldata/scsi-writethrough.xml diff --git a/tests/vmx2xmldata/vmx2xml-serial-device.vmx b/tests/vmx2xmldata/serial-device.vmx similarity index 100% rename from tests/vmx2xmldata/vmx2xml-serial-device.vmx rename to tests/vmx2xmldata/serial-device.vmx diff --git a/tests/vmx2xmldata/vmx2xml-serial-device.xml b/tests/vmx2xmldata/serial-device.xml similarity index 100% rename from tests/vmx2xmldata/vmx2xml-serial-device.xml rename to tests/vmx2xmldata/serial-device.xml diff --git a/tests/vmx2xmldata/vmx2xml-serial-file.vmx b/tests/vmx2xmldata/serial-file.vmx similarity index 100% rename from tests/vmx2xmldata/vmx2xml-serial-file.vmx rename to tests/vmx2xmldata/serial-file.vmx diff --git a/tests/vmx2xmldata/vmx2xml-serial-file.xml b/tests/vmx2xmldata/serial-file.xml similarity index 100% rename from tests/vmx2xmldata/vmx2xml-serial-file.xml rename to tests/vmx2xmldata/serial-file.xml diff --git a/tests/vmx2xmldata/vmx2xml-serial-network-client.vmx b/tests/vmx2xmldata/serial-network-client.vmx similarity index 100% rename from tests/vmx2xmldata/vmx2xml-serial-network-client.vmx rename to tests/vmx2xmldata/serial-network-client.vmx diff --git a/tests/vmx2xmldata/vmx2xml-serial-network-client.xml b/tests/vmx2xmldata/serial-network-client.xml similarity index 100% rename from tests/vmx2xmldata/vmx2xml-serial-network-client.xml rename to tests/vmx2xmldata/serial-network-client.xml diff --git a/tests/vmx2xmldata/vmx2xml-serial-network-server.vmx b/tests/vmx2xmldata/serial-network-server.vmx similarity index 100% rename from tests/vmx2xmldata/vmx2xml-serial-network-server.vmx rename to tests/vmx2xmldata/serial-network-server.vmx diff --git a/tests/vmx2xmldata/vmx2xml-serial-network-server.xml b/tests/vmx2xmldata/serial-network-server.xml similarity index 100% rename from tests/vmx2xmldata/vmx2xml-serial-network-server.xml rename to tests/vmx2xmldata/serial-network-server.xml diff --git a/tests/vmx2xmldata/vmx2xml-serial-pipe-client-app.vmx b/tests/vmx2xmldata/serial-pipe-client-app.vmx similarity index 100% rename from tests/vmx2xmldata/vmx2xml-serial-pipe-client-app.vmx rename to tests/vmx2xmldata/serial-pipe-client-app.vmx diff --git a/tests/vmx2xmldata/serial-pipe-client-app.xml b/tests/vmx2xmldata/serial-pipe-client-app.xml new file mode 120000 index 0000000000..44e3e1ee6e --- /dev/null +++ b/tests/vmx2xmldata/serial-pipe-client-app.xml @@ -0,0 +1 @@ +serial-pipe.xml \ No newline at end of file diff --git a/tests/vmx2xmldata/vmx2xml-serial-pipe-client-vm.vmx b/tests/vmx2xmldata/serial-pipe-client-vm.vmx similarity index 100% rename from tests/vmx2xmldata/vmx2xml-serial-pipe-client-vm.vmx rename to tests/vmx2xmldata/serial-pipe-client-vm.vmx diff --git a/tests/vmx2xmldata/vmx2xml-serial-pipe-server-app.vmx b/tests/vmx2xmldata/serial-pipe-server-app.vmx similarity index 100% rename from tests/vmx2xmldata/vmx2xml-serial-pipe-server-app.vmx rename to tests/vmx2xmldata/serial-pipe-server-app.vmx diff --git a/tests/vmx2xmldata/vmx2xml-serial-pipe-server-vm.vmx b/tests/vmx2xmldata/serial-pipe-server-vm.vmx similarity index 100% rename from tests/vmx2xmldata/vmx2xml-serial-pipe-server-vm.vmx rename to tests/vmx2xmldata/serial-pipe-server-vm.vmx diff --git a/tests/vmx2xmldata/serial-pipe-server-vm.xml b/tests/vmx2xmldata/serial-pipe-server-vm.xml new file mode 120000 index 0000000000..44e3e1ee6e --- /dev/null +++ b/tests/vmx2xmldata/serial-pipe-server-vm.xml @@ -0,0 +1 @@ +serial-pipe.xml \ No newline at end of file diff --git a/tests/vmx2xmldata/vmx2xml-serial-pipe.xml b/tests/vmx2xmldata/serial-pipe.xml similarity index 100% rename from tests/vmx2xmldata/vmx2xml-serial-pipe.xml rename to tests/vmx2xmldata/serial-pipe.xml diff --git a/tests/vmx2xmldata/vmx2xml-sharedfolder.vmx b/tests/vmx2xmldata/sharedfolder.vmx similarity index 100% rename from tests/vmx2xmldata/vmx2xml-sharedfolder.vmx rename to tests/vmx2xmldata/sharedfolder.vmx diff --git a/tests/vmx2xmldata/vmx2xml-sharedfolder.xml b/tests/vmx2xmldata/sharedfolder.xml similarity index 100% rename from tests/vmx2xmldata/vmx2xml-sharedfolder.xml rename to tests/vmx2xmldata/sharedfolder.xml diff --git a/tests/vmx2xmldata/vmx2xml-smbios.vmx b/tests/vmx2xmldata/smbios.vmx similarity index 100% rename from tests/vmx2xmldata/vmx2xml-smbios.vmx rename to tests/vmx2xmldata/smbios.vmx diff --git a/tests/vmx2xmldata/vmx2xml-smbios.xml b/tests/vmx2xmldata/smbios.xml similarity index 100% rename from tests/vmx2xmldata/vmx2xml-smbios.xml rename to tests/vmx2xmldata/smbios.xml diff --git a/tests/vmx2xmldata/vmx2xml-svga.vmx b/tests/vmx2xmldata/svga.vmx similarity index 100% rename from tests/vmx2xmldata/vmx2xml-svga.vmx rename to tests/vmx2xmldata/svga.vmx diff --git a/tests/vmx2xmldata/vmx2xml-svga.xml b/tests/vmx2xmldata/svga.xml similarity index 100% rename from tests/vmx2xmldata/vmx2xml-svga.xml rename to tests/vmx2xmldata/svga.xml diff --git a/tests/vmx2xmldata/vmx2xml-cdrom-ide-file-missing-datastore.xml b/tests/vmx2xmldata/vmx2xml-cdrom-ide-file-missing-datastore.xml deleted file mode 120000 index 87e5c1d22d..0000000000 --- a/tests/vmx2xmldata/vmx2xml-cdrom-ide-file-missing-datastore.xml +++ /dev/null @@ -1 +0,0 @@ -vmx2xml-cdrom-ide-empty.xml \ No newline at end of file diff --git a/tests/vmx2xmldata/vmx2xml-cdrom-ide-file-missing-file.xml b/tests/vmx2xmldata/vmx2xml-cdrom-ide-file-missing-file.xml deleted file mode 120000 index 87e5c1d22d..0000000000 --- a/tests/vmx2xmldata/vmx2xml-cdrom-ide-file-missing-file.xml +++ /dev/null @@ -1 +0,0 @@ -vmx2xml-cdrom-ide-empty.xml \ No newline at end of file diff --git a/tests/vmx2xmldata/vmx2xml-serial-pipe-client-app.xml b/tests/vmx2xmldata/vmx2xml-serial-pipe-client-app.xml deleted file mode 120000 index d0b077d644..0000000000 --- a/tests/vmx2xmldata/vmx2xml-serial-pipe-client-app.xml +++ /dev/null @@ -1 +0,0 @@ -vmx2xml-serial-pipe.xml \ No newline at end of file diff --git a/tests/vmx2xmldata/vmx2xml-serial-pipe-server-vm.xml b/tests/vmx2xmldata/vmx2xml-serial-pipe-server-vm.xml deleted file mode 120000 index d0b077d644..0000000000 --- a/tests/vmx2xmldata/vmx2xml-serial-pipe-server-vm.xml +++ /dev/null @@ -1 +0,0 @@ -vmx2xml-serial-pipe.xml \ No newline at end of file diff --git a/tests/vmx2xmldata/vmx2xml-ws-in-the-wild-1.vmx b/tests/vmx2xmldata/ws-in-the-wild-1.vmx similarity index 100% rename from tests/vmx2xmldata/vmx2xml-ws-in-the-wild-1.vmx rename to tests/vmx2xmldata/ws-in-the-wild-1.vmx diff --git a/tests/vmx2xmldata/vmx2xml-ws-in-the-wild-1.xml b/tests/vmx2xmldata/ws-in-the-wild-1.xml similarity index 100% rename from tests/vmx2xmldata/vmx2xml-ws-in-the-wild-1.xml rename to tests/vmx2xmldata/ws-in-the-wild-1.xml diff --git a/tests/vmx2xmldata/vmx2xml-ws-in-the-wild-2.vmx b/tests/vmx2xmldata/ws-in-the-wild-2.vmx similarity index 100% rename from tests/vmx2xmldata/vmx2xml-ws-in-the-wild-2.vmx rename to tests/vmx2xmldata/ws-in-the-wild-2.vmx diff --git a/tests/vmx2xmldata/vmx2xml-ws-in-the-wild-2.xml b/tests/vmx2xmldata/ws-in-the-wild-2.xml similarity index 100% rename from tests/vmx2xmldata/vmx2xml-ws-in-the-wild-2.xml rename to tests/vmx2xmldata/ws-in-the-wild-2.xml diff --git a/tests/vmx2xmltest.c b/tests/vmx2xmltest.c index 9f7f50b42d..c97c4c045e 100644 --- a/tests/vmx2xmltest.c +++ b/tests/vmx2xmltest.c @@ -122,9 +122,9 @@ testCompareHelper(const void *data) char *vmx = NULL; char *xml = NULL; - vmx = g_strdup_printf("%s/vmx2xmldata/vmx2xml-%s.vmx", abs_srcdir, + vmx = g_strdup_printf("%s/vmx2xmldata/%s.vmx", abs_srcdir, info->file); - xml = g_strdup_printf("%s/vmx2xmldata/vmx2xml-%s.xml", abs_srcdir, + xml = g_strdup_printf("%s/vmx2xmldata/%s.xml", abs_srcdir, info->file); ret = testCompareFiles(vmx, xml, info->should_fail);