[PATCH 0/3] vmx: Drop useless prefix for test cases
You can find these also here: https://gitlab.com/MichalPrivoznik/libvirt/-/tree/vmx_floppy Michal Prívozník (3): vmx2xmltest: Drop duplicate testcases vmx2xmltest: Deduplicate DO_TEST*() arguments tests: Drop vmx2xml- prefix for vmx2xml test cases ...{vmx2xml-annotation.vmx => annotation.vmx} | 0 ...{vmx2xml-annotation.xml => annotation.xml} | 0 ...sensitive-1.vmx => case-insensitive-1.vmx} | 0 ...sensitive-1.xml => case-insensitive-1.xml} | 0 ...sensitive-2.vmx => case-insensitive-2.vmx} | 0 ...sensitive-2.xml => case-insensitive-2.xml} | 0 ...om-ide-device.vmx => cdrom-ide-device.vmx} | 0 ...om-ide-device.xml => cdrom-ide-device.xml} | 0 ...-ide-empty-2.vmx => cdrom-ide-empty-2.vmx} | 0 ...-ide-empty-2.xml => cdrom-ide-empty-2.xml} | 0 ...drom-ide-empty.vmx => cdrom-ide-empty.vmx} | 0 ...drom-ide-empty.xml => cdrom-ide-empty.xml} | 0 ...x => cdrom-ide-file-missing-datastore.vmx} | 0 .../cdrom-ide-file-missing-datastore.xml | 1 + ...le.vmx => cdrom-ide-file-missing-file.vmx} | 0 .../cdrom-ide-file-missing-file.xml | 1 + ...-cdrom-ide-file.vmx => cdrom-ide-file.vmx} | 0 ...-cdrom-ide-file.xml => cdrom-ide-file.xml} | 0 ...tect.vmx => cdrom-ide-raw-auto-detect.vmx} | 0 ...tect.xml => cdrom-ide-raw-auto-detect.xml} | 0 ...aw-device.vmx => cdrom-ide-raw-device.vmx} | 0 ...aw-device.xml => cdrom-ide-raw-device.xml} | 0 ...-scsi-device.vmx => cdrom-scsi-device.vmx} | 0 ...-scsi-device.xml => cdrom-scsi-device.xml} | 0 ...om-scsi-empty.vmx => cdrom-scsi-empty.vmx} | 0 ...om-scsi-empty.xml => cdrom-scsi-empty.xml} | 0 ...drom-scsi-file.vmx => cdrom-scsi-file.vmx} | 0 ...drom-scsi-file.xml => cdrom-scsi-file.xml} | 0 ...i-passthru.vmx => cdrom-scsi-passthru.vmx} | 0 ...i-passthru.xml => cdrom-scsi-passthru.xml} | 0 ...ect.vmx => cdrom-scsi-raw-auto-detect.vmx} | 0 ...ect.xml => cdrom-scsi-raw-auto-detect.xml} | 0 ...w-device.vmx => cdrom-scsi-raw-device.vmx} | 0 ...w-device.xml => cdrom-scsi-raw-device.xml} | 0 ...-datacenterpath.vmx => datacenterpath.vmx} | 0 ...-datacenterpath.xml => datacenterpath.xml} | 0 ...n-the-wild-1.vmx => esx-in-the-wild-1.vmx} | 0 ...n-the-wild-1.xml => esx-in-the-wild-1.xml} | 0 ...the-wild-10.vmx => esx-in-the-wild-10.vmx} | 0 ...the-wild-10.xml => esx-in-the-wild-10.xml} | 0 ...the-wild-11.vmx => esx-in-the-wild-11.vmx} | 0 ...the-wild-11.xml => esx-in-the-wild-11.xml} | 0 ...n-the-wild-2.vmx => esx-in-the-wild-2.vmx} | 0 ...n-the-wild-2.xml => esx-in-the-wild-2.xml} | 0 ...n-the-wild-3.vmx => esx-in-the-wild-3.vmx} | 0 ...n-the-wild-3.xml => esx-in-the-wild-3.xml} | 0 ...n-the-wild-4.vmx => esx-in-the-wild-4.vmx} | 0 ...n-the-wild-4.xml => esx-in-the-wild-4.xml} | 0 ...n-the-wild-5.vmx => esx-in-the-wild-5.vmx} | 0 ...n-the-wild-5.xml => esx-in-the-wild-5.xml} | 0 ...n-the-wild-6.vmx => esx-in-the-wild-6.vmx} | 0 ...n-the-wild-6.xml => esx-in-the-wild-6.xml} | 0 ...n-the-wild-7.vmx => esx-in-the-wild-7.vmx} | 0 ...n-the-wild-7.xml => esx-in-the-wild-7.xml} | 0 ...n-the-wild-8.vmx => esx-in-the-wild-8.vmx} | 0 ...n-the-wild-8.xml => esx-in-the-wild-8.xml} | 0 ...n-the-wild-9.vmx => esx-in-the-wild-9.vmx} | 0 ...n-the-wild-9.xml => esx-in-the-wild-9.xml} | 0 ...ernet-bridged.vmx => ethernet-bridged.vmx} | 0 ...ernet-bridged.xml => ethernet-bridged.xml} | 0 ...thernet-custom.vmx => ethernet-custom.vmx} | 0 ...thernet-custom.xml => ethernet-custom.xml} | 0 ...-ethernet-e1000.vmx => ethernet-e1000.vmx} | 0 ...-ethernet-e1000.xml => ethernet-e1000.xml} | 0 ...t-generated.vmx => ethernet-generated.vmx} | 0 ...t-generated.xml => ethernet-generated.xml} | 0 ...2xml-ethernet-nat.vmx => ethernet-nat.vmx} | 0 ...2xml-ethernet-nat.xml => ethernet-nat.xml} | 0 ...-ethernet-other.vmx => ethernet-other.vmx} | 0 ...-ethernet-other.xml => ethernet-other.xml} | 0 ...thernet-static.vmx => ethernet-static.vmx} | 0 ...thernet-static.xml => ethernet-static.xml} | 0 ...ernet-vmxnet2.vmx => ethernet-vmxnet2.vmx} | 0 ...ernet-vmxnet2.xml => ethernet-vmxnet2.xml} | 0 ...2xml-ethernet-vpx.vmx => ethernet-vpx.vmx} | 0 ...2xml-ethernet-vpx.xml => ethernet-vpx.xml} | 0 ...2xml-firmware-efi.vmx => firmware-efi.vmx} | 0 ...2xml-firmware-efi.xml => firmware-efi.xml} | 0 ...ml-floppy-device.vmx => floppy-device.vmx} | 0 ...ml-floppy-device.xml => floppy-device.xml} | 0 ...mx2xml-floppy-file.vmx => floppy-file.vmx} | 0 ...mx2xml-floppy-file.xml => floppy-file.xml} | 0 ...he-wild-1.vmx => fusion-in-the-wild-1.vmx} | 0 ...he-wild-1.xml => fusion-in-the-wild-1.xml} | 0 ...2xml-graphics-vnc.vmx => graphics-vnc.vmx} | 0 ...2xml-graphics-vnc.xml => graphics-vnc.xml} | 0 ...n-the-wild-1.vmx => gsx-in-the-wild-1.vmx} | 0 ...n-the-wild-1.xml => gsx-in-the-wild-1.xml} | 0 ...n-the-wild-2.vmx => gsx-in-the-wild-2.vmx} | 0 ...n-the-wild-2.xml => gsx-in-the-wild-2.xml} | 0 ...n-the-wild-3.vmx => gsx-in-the-wild-3.vmx} | 0 ...n-the-wild-3.xml => gsx-in-the-wild-3.xml} | 0 ...n-the-wild-4.vmx => gsx-in-the-wild-4.vmx} | 0 ...n-the-wild-4.xml => gsx-in-the-wild-4.xml} | 0 ...> harddisk-ide-file-missing-datastore.vmx} | 0 ...isk-ide-file.vmx => harddisk-ide-file.vmx} | 0 ...isk-ide-file.xml => harddisk-ide-file.xml} | 0 ...mx => harddisk-scsi-file-missing-file.vmx} | 0 ...k-scsi-file.vmx => harddisk-scsi-file.vmx} | 0 ...k-scsi-file.xml => harddisk-scsi-file.xml} | 0 ...k-transient.vmx => harddisk-transient.vmx} | 0 ...k-transient.xml => harddisk-transient.xml} | 0 ...ml-minimal-64bit.vmx => minimal-64bit.vmx} | 0 ...ml-minimal-64bit.xml => minimal-64bit.xml} | 0 .../{vmx2xml-minimal.vmx => minimal.vmx} | 0 .../{vmx2xml-minimal.xml => minimal.xml} | 0 ...arallel-device.vmx => parallel-device.vmx} | 0 ...arallel-device.xml => parallel-device.xml} | 0 ...ml-parallel-file.vmx => parallel-file.vmx} | 0 ...ml-parallel-file.xml => parallel-file.xml} | 0 ...mx2xml-scsi-driver.vmx => scsi-driver.vmx} | 0 ...mx2xml-scsi-driver.xml => scsi-driver.xml} | 0 ...writethrough.vmx => scsi-writethrough.vmx} | 0 ...writethrough.xml => scsi-writethrough.xml} | 0 ...ml-serial-device.vmx => serial-device.vmx} | 0 ...ml-serial-device.xml => serial-device.xml} | 0 ...mx2xml-serial-file.vmx => serial-file.vmx} | 0 ...mx2xml-serial-file.xml => serial-file.xml} | 0 ...k-client.vmx => serial-network-client.vmx} | 0 ...k-client.xml => serial-network-client.xml} | 0 ...k-server.vmx => serial-network-server.vmx} | 0 ...k-server.xml => serial-network-server.xml} | 0 ...ent-app.vmx => serial-pipe-client-app.vmx} | 0 tests/vmx2xmldata/serial-pipe-client-app.xml | 1 + ...lient-vm.vmx => serial-pipe-client-vm.vmx} | 0 ...ver-app.vmx => serial-pipe-server-app.vmx} | 0 ...erver-vm.vmx => serial-pipe-server-vm.vmx} | 0 tests/vmx2xmldata/serial-pipe-server-vm.xml | 1 + ...mx2xml-serial-pipe.xml => serial-pipe.xml} | 0 ...2xml-sharedfolder.vmx => sharedfolder.vmx} | 0 ...2xml-sharedfolder.xml => sharedfolder.xml} | 0 .../{vmx2xml-smbios.vmx => smbios.vmx} | 0 .../{vmx2xml-smbios.xml => smbios.xml} | 0 .../{vmx2xml-svga.vmx => svga.vmx} | 0 .../{vmx2xml-svga.xml => svga.xml} | 0 ...in-the-wild-1.vmx => ws-in-the-wild-1.vmx} | 0 ...in-the-wild-1.xml => ws-in-the-wild-1.xml} | 0 ...in-the-wild-2.vmx => ws-in-the-wild-2.vmx} | 0 ...in-the-wild-2.xml => ws-in-the-wild-2.xml} | 0 tests/vmx2xmltest.c | 206 +++++++++--------- 140 files changed, 105 insertions(+), 105 deletions(-) rename tests/vmx2xmldata/{vmx2xml-annotation.vmx => annotation.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-annotation.xml => annotation.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-case-insensitive-1.vmx => case-insensitive-1.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-case-insensitive-1.xml => case-insensitive-1.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-case-insensitive-2.vmx => case-insensitive-2.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-case-insensitive-2.xml => case-insensitive-2.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-cdrom-ide-device.vmx => cdrom-ide-device.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-cdrom-ide-device.xml => cdrom-ide-device.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-cdrom-ide-empty-2.vmx => cdrom-ide-empty-2.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-cdrom-ide-empty-2.xml => cdrom-ide-empty-2.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-cdrom-ide-empty.vmx => cdrom-ide-empty.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-cdrom-ide-empty.xml => cdrom-ide-empty.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-cdrom-ide-file-missing-datastore.vmx => cdrom-ide-file-missing-datastore.vmx} (100%) create mode 120000 tests/vmx2xmldata/cdrom-ide-file-missing-datastore.xml rename tests/vmx2xmldata/{vmx2xml-cdrom-ide-file-missing-file.vmx => cdrom-ide-file-missing-file.vmx} (100%) create mode 120000 tests/vmx2xmldata/cdrom-ide-file-missing-file.xml rename tests/vmx2xmldata/{vmx2xml-cdrom-ide-file.vmx => cdrom-ide-file.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-cdrom-ide-file.xml => cdrom-ide-file.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-cdrom-ide-raw-auto-detect.vmx => cdrom-ide-raw-auto-detect.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-cdrom-ide-raw-auto-detect.xml => cdrom-ide-raw-auto-detect.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-cdrom-ide-raw-device.vmx => cdrom-ide-raw-device.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-cdrom-ide-raw-device.xml => cdrom-ide-raw-device.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-cdrom-scsi-device.vmx => cdrom-scsi-device.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-cdrom-scsi-device.xml => cdrom-scsi-device.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-cdrom-scsi-empty.vmx => cdrom-scsi-empty.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-cdrom-scsi-empty.xml => cdrom-scsi-empty.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-cdrom-scsi-file.vmx => cdrom-scsi-file.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-cdrom-scsi-file.xml => cdrom-scsi-file.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-cdrom-scsi-passthru.vmx => cdrom-scsi-passthru.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-cdrom-scsi-passthru.xml => cdrom-scsi-passthru.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-cdrom-scsi-raw-auto-detect.vmx => cdrom-scsi-raw-auto-detect.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-cdrom-scsi-raw-auto-detect.xml => cdrom-scsi-raw-auto-detect.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-cdrom-scsi-raw-device.vmx => cdrom-scsi-raw-device.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-cdrom-scsi-raw-device.xml => cdrom-scsi-raw-device.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-datacenterpath.vmx => datacenterpath.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-datacenterpath.xml => datacenterpath.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-esx-in-the-wild-1.vmx => esx-in-the-wild-1.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-esx-in-the-wild-1.xml => esx-in-the-wild-1.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-esx-in-the-wild-10.vmx => esx-in-the-wild-10.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-esx-in-the-wild-10.xml => esx-in-the-wild-10.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-esx-in-the-wild-11.vmx => esx-in-the-wild-11.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-esx-in-the-wild-11.xml => esx-in-the-wild-11.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-esx-in-the-wild-2.vmx => esx-in-the-wild-2.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-esx-in-the-wild-2.xml => esx-in-the-wild-2.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-esx-in-the-wild-3.vmx => esx-in-the-wild-3.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-esx-in-the-wild-3.xml => esx-in-the-wild-3.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-esx-in-the-wild-4.vmx => esx-in-the-wild-4.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-esx-in-the-wild-4.xml => esx-in-the-wild-4.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-esx-in-the-wild-5.vmx => esx-in-the-wild-5.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-esx-in-the-wild-5.xml => esx-in-the-wild-5.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-esx-in-the-wild-6.vmx => esx-in-the-wild-6.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-esx-in-the-wild-6.xml => esx-in-the-wild-6.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-esx-in-the-wild-7.vmx => esx-in-the-wild-7.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-esx-in-the-wild-7.xml => esx-in-the-wild-7.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-esx-in-the-wild-8.vmx => esx-in-the-wild-8.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-esx-in-the-wild-8.xml => esx-in-the-wild-8.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-esx-in-the-wild-9.vmx => esx-in-the-wild-9.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-esx-in-the-wild-9.xml => esx-in-the-wild-9.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-ethernet-bridged.vmx => ethernet-bridged.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-ethernet-bridged.xml => ethernet-bridged.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-ethernet-custom.vmx => ethernet-custom.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-ethernet-custom.xml => ethernet-custom.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-ethernet-e1000.vmx => ethernet-e1000.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-ethernet-e1000.xml => ethernet-e1000.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-ethernet-generated.vmx => ethernet-generated.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-ethernet-generated.xml => ethernet-generated.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-ethernet-nat.vmx => ethernet-nat.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-ethernet-nat.xml => ethernet-nat.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-ethernet-other.vmx => ethernet-other.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-ethernet-other.xml => ethernet-other.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-ethernet-static.vmx => ethernet-static.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-ethernet-static.xml => ethernet-static.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-ethernet-vmxnet2.vmx => ethernet-vmxnet2.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-ethernet-vmxnet2.xml => ethernet-vmxnet2.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-ethernet-vpx.vmx => ethernet-vpx.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-ethernet-vpx.xml => ethernet-vpx.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-firmware-efi.vmx => firmware-efi.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-firmware-efi.xml => firmware-efi.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-floppy-device.vmx => floppy-device.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-floppy-device.xml => floppy-device.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-floppy-file.vmx => floppy-file.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-floppy-file.xml => floppy-file.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-fusion-in-the-wild-1.vmx => fusion-in-the-wild-1.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-fusion-in-the-wild-1.xml => fusion-in-the-wild-1.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-graphics-vnc.vmx => graphics-vnc.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-graphics-vnc.xml => graphics-vnc.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-gsx-in-the-wild-1.vmx => gsx-in-the-wild-1.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-gsx-in-the-wild-1.xml => gsx-in-the-wild-1.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-gsx-in-the-wild-2.vmx => gsx-in-the-wild-2.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-gsx-in-the-wild-2.xml => gsx-in-the-wild-2.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-gsx-in-the-wild-3.vmx => gsx-in-the-wild-3.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-gsx-in-the-wild-3.xml => gsx-in-the-wild-3.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-gsx-in-the-wild-4.vmx => gsx-in-the-wild-4.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-gsx-in-the-wild-4.xml => gsx-in-the-wild-4.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-harddisk-ide-file-missing-datastore.vmx => harddisk-ide-file-missing-datastore.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-harddisk-ide-file.vmx => harddisk-ide-file.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-harddisk-ide-file.xml => harddisk-ide-file.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-harddisk-scsi-file-missing-file.vmx => harddisk-scsi-file-missing-file.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-harddisk-scsi-file.vmx => harddisk-scsi-file.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-harddisk-scsi-file.xml => harddisk-scsi-file.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-harddisk-transient.vmx => harddisk-transient.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-harddisk-transient.xml => harddisk-transient.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-minimal-64bit.vmx => minimal-64bit.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-minimal-64bit.xml => minimal-64bit.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-minimal.vmx => minimal.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-minimal.xml => minimal.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-parallel-device.vmx => parallel-device.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-parallel-device.xml => parallel-device.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-parallel-file.vmx => parallel-file.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-parallel-file.xml => parallel-file.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-scsi-driver.vmx => scsi-driver.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-scsi-driver.xml => scsi-driver.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-scsi-writethrough.vmx => scsi-writethrough.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-scsi-writethrough.xml => scsi-writethrough.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-serial-device.vmx => serial-device.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-serial-device.xml => serial-device.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-serial-file.vmx => serial-file.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-serial-file.xml => serial-file.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-serial-network-client.vmx => serial-network-client.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-serial-network-client.xml => serial-network-client.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-serial-network-server.vmx => serial-network-server.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-serial-network-server.xml => serial-network-server.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-serial-pipe-client-app.vmx => serial-pipe-client-app.vmx} (100%) create mode 120000 tests/vmx2xmldata/serial-pipe-client-app.xml rename tests/vmx2xmldata/{vmx2xml-serial-pipe-client-vm.vmx => serial-pipe-client-vm.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-serial-pipe-server-app.vmx => serial-pipe-server-app.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-serial-pipe-server-vm.vmx => serial-pipe-server-vm.vmx} (100%) create mode 120000 tests/vmx2xmldata/serial-pipe-server-vm.xml rename tests/vmx2xmldata/{vmx2xml-serial-pipe.xml => serial-pipe.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-sharedfolder.vmx => sharedfolder.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-sharedfolder.xml => sharedfolder.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-smbios.vmx => smbios.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-smbios.xml => smbios.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-svga.vmx => svga.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-svga.xml => svga.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-ws-in-the-wild-1.vmx => ws-in-the-wild-1.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-ws-in-the-wild-1.xml => ws-in-the-wild-1.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-ws-in-the-wild-2.vmx => ws-in-the-wild-2.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-ws-in-the-wild-2.xml => ws-in-the-wild-2.xml} (100%) -- 2.31.1
There are three test cases are called twice. This is needless. Drop redundant calls. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- tests/vmx2xmltest.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/tests/vmx2xmltest.c b/tests/vmx2xmltest.c index 453641faf1..00a87b3576 100644 --- a/tests/vmx2xmltest.c +++ b/tests/vmx2xmltest.c @@ -245,7 +245,6 @@ mymain(void) DO_TEST("cdrom-ide-device", "cdrom-ide-device"); DO_TEST("cdrom-ide-raw-device", "cdrom-ide-raw-device"); DO_TEST("cdrom-ide-raw-auto-detect", "cdrom-ide-raw-auto-detect"); - DO_TEST("cdrom-ide-raw-auto-detect", "cdrom-ide-raw-auto-detect"); DO_TEST("cdrom-ide-file-missing-datastore", "cdrom-ide-empty"); DO_TEST("cdrom-ide-file-missing-file", "cdrom-ide-empty"); @@ -274,8 +273,6 @@ mymain(void) DO_TEST("serial-device", "serial-device"); DO_TEST("serial-pipe-client-app", "serial-pipe"); DO_TEST("serial-pipe-server-vm", "serial-pipe"); - DO_TEST("serial-pipe-client-app", "serial-pipe"); - DO_TEST("serial-pipe-server-vm", "serial-pipe"); DO_TEST("serial-network-server", "serial-network-server"); DO_TEST("serial-network-client", "serial-network-client"); -- 2.31.1
On Wed, Aug 18, 2021 at 03:51:10PM +0200, Michal Privoznik wrote:
There are three test cases are called twice. This is needless. Drop redundant calls.
Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- tests/vmx2xmltest.c | 3 --- 1 file changed, 3 deletions(-)
diff --git a/tests/vmx2xmltest.c b/tests/vmx2xmltest.c index 453641faf1..00a87b3576 100644 --- a/tests/vmx2xmltest.c +++ b/tests/vmx2xmltest.c @@ -245,7 +245,6 @@ mymain(void) DO_TEST("cdrom-ide-device", "cdrom-ide-device"); DO_TEST("cdrom-ide-raw-device", "cdrom-ide-raw-device"); DO_TEST("cdrom-ide-raw-auto-detect", "cdrom-ide-raw-auto-detect"); - DO_TEST("cdrom-ide-raw-auto-detect", "cdrom-ide-raw-auto-detect");
DO_TEST("cdrom-ide-file-missing-datastore", "cdrom-ide-empty"); DO_TEST("cdrom-ide-file-missing-file", "cdrom-ide-empty"); @@ -274,8 +273,6 @@ mymain(void) DO_TEST("serial-device", "serial-device"); DO_TEST("serial-pipe-client-app", "serial-pipe"); DO_TEST("serial-pipe-server-vm", "serial-pipe"); - DO_TEST("serial-pipe-client-app", "serial-pipe"); - DO_TEST("serial-pipe-server-vm", "serial-pipe");
Looks like these should actually be changed to client-vm and server-app as the test files exist for all four combinations.
DO_TEST("serial-network-server", "serial-network-server"); DO_TEST("serial-network-client", "serial-network-client");
-- 2.31.1
In majority of DO_TEST() and DO_TEST_FAIL() calls the input vmx file name is the same as the output XML file. Therefore, it's not necessary to provide the same string twice. For the rest, where the output XML file is different we can use symlinks to the expected output. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- ...x2xml-cdrom-ide-file-missing-datastore.xml | 1 + .../vmx2xml-cdrom-ide-file-missing-file.xml | 1 + .../vmx2xml-serial-pipe-client-app.xml | 1 + .../vmx2xml-serial-pipe-server-vm.xml | 1 + tests/vmx2xmltest.c | 155 +++++++++--------- 5 files changed, 81 insertions(+), 78 deletions(-) create mode 120000 tests/vmx2xmldata/vmx2xml-cdrom-ide-file-missing-datastore.xml create mode 120000 tests/vmx2xmldata/vmx2xml-cdrom-ide-file-missing-file.xml create mode 120000 tests/vmx2xmldata/vmx2xml-serial-pipe-client-app.xml create mode 120000 tests/vmx2xmldata/vmx2xml-serial-pipe-server-vm.xml diff --git a/tests/vmx2xmldata/vmx2xml-cdrom-ide-file-missing-datastore.xml b/tests/vmx2xmldata/vmx2xml-cdrom-ide-file-missing-datastore.xml new file mode 120000 index 0000000000..87e5c1d22d --- /dev/null +++ b/tests/vmx2xmldata/vmx2xml-cdrom-ide-file-missing-datastore.xml @@ -0,0 +1 @@ +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 new file mode 120000 index 0000000000..87e5c1d22d --- /dev/null +++ b/tests/vmx2xmldata/vmx2xml-cdrom-ide-file-missing-file.xml @@ -0,0 +1 @@ +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 new file mode 120000 index 0000000000..d0b077d644 --- /dev/null +++ b/tests/vmx2xmldata/vmx2xml-serial-pipe-client-app.xml @@ -0,0 +1 @@ +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 new file mode 120000 index 0000000000..d0b077d644 --- /dev/null +++ b/tests/vmx2xmldata/vmx2xml-serial-pipe-server-vm.xml @@ -0,0 +1 @@ +vmx2xml-serial-pipe.xml \ No newline at end of file diff --git a/tests/vmx2xmltest.c b/tests/vmx2xmltest.c index 00a87b3576..9f7f50b42d 100644 --- a/tests/vmx2xmltest.c +++ b/tests/vmx2xmltest.c @@ -110,8 +110,7 @@ testCompareFiles(const char *vmx, const char *xml, bool should_fail_parse) } struct testInfo { - const char *input; - const char *output; + const char *file; bool should_fail; }; @@ -124,9 +123,9 @@ testCompareHelper(const void *data) char *xml = NULL; vmx = g_strdup_printf("%s/vmx2xmldata/vmx2xml-%s.vmx", abs_srcdir, - info->input); + info->file); xml = g_strdup_printf("%s/vmx2xmldata/vmx2xml-%s.xml", abs_srcdir, - info->output); + info->file); ret = testCompareFiles(vmx, xml, info->should_fail); @@ -191,18 +190,18 @@ mymain(void) { int ret = 0; -# define DO_TEST_FULL(_in, _out, _should_fail) \ +# define DO_TEST_FULL(file, should_fail) \ do { \ - struct testInfo info = { _in, _out, _should_fail }; \ + struct testInfo info = { file, should_fail }; \ virResetLastError(); \ - if (virTestRun("VMware VMX-2-XML "_in" -> "_out, \ + if (virTestRun("VMware VMX-2-XML " file, \ testCompareHelper, &info) < 0) { \ ret = -1; \ } \ } while (0) -# define DO_TEST(_in, _out) DO_TEST_FULL(_in, _out, false) -# define DO_TEST_FAIL(_in, _out) DO_TEST_FULL(_in, _out, true) +# define DO_TEST(file) DO_TEST_FULL(file, false) +# define DO_TEST_FAIL(file) DO_TEST_FULL(file, true) testCapsInit(); @@ -218,100 +217,100 @@ mymain(void) ctx.autodetectSCSIControllerModel = NULL; ctx.datacenterPath = NULL; - DO_TEST("case-insensitive-1", "case-insensitive-1"); - DO_TEST("case-insensitive-2", "case-insensitive-2"); + DO_TEST("case-insensitive-1"); + DO_TEST("case-insensitive-2"); - DO_TEST("minimal", "minimal"); - DO_TEST("minimal-64bit", "minimal-64bit"); + DO_TEST("minimal"); + DO_TEST("minimal-64bit"); - DO_TEST("graphics-vnc", "graphics-vnc"); + DO_TEST("graphics-vnc"); - DO_TEST("scsi-driver", "scsi-driver"); - DO_TEST("scsi-writethrough", "scsi-writethrough"); + DO_TEST("scsi-driver"); + DO_TEST("scsi-writethrough"); - DO_TEST("harddisk-scsi-file", "harddisk-scsi-file"); - DO_TEST("harddisk-ide-file", "harddisk-ide-file"); - DO_TEST("harddisk-transient", "harddisk-transient"); + DO_TEST("harddisk-scsi-file"); + DO_TEST("harddisk-ide-file"); + DO_TEST("harddisk-transient"); - DO_TEST("cdrom-scsi-file", "cdrom-scsi-file"); - DO_TEST("cdrom-scsi-empty", "cdrom-scsi-empty"); - DO_TEST("cdrom-scsi-device", "cdrom-scsi-device"); - DO_TEST("cdrom-scsi-raw-device", "cdrom-scsi-raw-device"); - DO_TEST("cdrom-scsi-raw-auto-detect", "cdrom-scsi-raw-auto-detect"); - DO_TEST("cdrom-scsi-passthru", "cdrom-scsi-passthru"); - DO_TEST("cdrom-ide-file", "cdrom-ide-file"); - DO_TEST("cdrom-ide-empty", "cdrom-ide-empty"); - DO_TEST("cdrom-ide-empty-2", "cdrom-ide-empty-2"); - DO_TEST("cdrom-ide-device", "cdrom-ide-device"); - DO_TEST("cdrom-ide-raw-device", "cdrom-ide-raw-device"); - DO_TEST("cdrom-ide-raw-auto-detect", "cdrom-ide-raw-auto-detect"); + DO_TEST("cdrom-scsi-file"); + DO_TEST("cdrom-scsi-empty"); + DO_TEST("cdrom-scsi-device"); + DO_TEST("cdrom-scsi-raw-device"); + DO_TEST("cdrom-scsi-raw-auto-detect"); + DO_TEST("cdrom-scsi-passthru"); + DO_TEST("cdrom-ide-file"); + DO_TEST("cdrom-ide-empty"); + DO_TEST("cdrom-ide-empty-2"); + DO_TEST("cdrom-ide-device"); + DO_TEST("cdrom-ide-raw-device"); + DO_TEST("cdrom-ide-raw-auto-detect"); - DO_TEST("cdrom-ide-file-missing-datastore", "cdrom-ide-empty"); - DO_TEST("cdrom-ide-file-missing-file", "cdrom-ide-empty"); + DO_TEST("cdrom-ide-file-missing-datastore"); + DO_TEST("cdrom-ide-file-missing-file"); - DO_TEST_FAIL("harddisk-ide-file-missing-datastore", "harddisk-ide-file"); - DO_TEST_FAIL("harddisk-scsi-file-missing-file", "harddisk-scsi-file"); + DO_TEST_FAIL("harddisk-ide-file-missing-datastore"); + DO_TEST_FAIL("harddisk-scsi-file-missing-file"); - DO_TEST("floppy-file", "floppy-file"); - DO_TEST("floppy-device", "floppy-device"); + DO_TEST("floppy-file"); + DO_TEST("floppy-device"); - DO_TEST("sharedfolder", "sharedfolder"); + DO_TEST("sharedfolder"); - DO_TEST("ethernet-e1000", "ethernet-e1000"); - DO_TEST("ethernet-vmxnet2", "ethernet-vmxnet2"); + DO_TEST("ethernet-e1000"); + DO_TEST("ethernet-vmxnet2"); - DO_TEST("ethernet-custom", "ethernet-custom"); - DO_TEST("ethernet-bridged", "ethernet-bridged"); - DO_TEST("ethernet-nat", "ethernet-nat"); + DO_TEST("ethernet-custom"); + DO_TEST("ethernet-bridged"); + DO_TEST("ethernet-nat"); - DO_TEST("ethernet-generated", "ethernet-generated"); - DO_TEST("ethernet-static", "ethernet-static"); - DO_TEST("ethernet-vpx", "ethernet-vpx"); - DO_TEST("ethernet-other", "ethernet-other"); + DO_TEST("ethernet-generated"); + DO_TEST("ethernet-static"); + DO_TEST("ethernet-vpx"); + DO_TEST("ethernet-other"); - DO_TEST("serial-file", "serial-file"); - DO_TEST("serial-device", "serial-device"); - DO_TEST("serial-pipe-client-app", "serial-pipe"); - DO_TEST("serial-pipe-server-vm", "serial-pipe"); - DO_TEST("serial-network-server", "serial-network-server"); - DO_TEST("serial-network-client", "serial-network-client"); + DO_TEST("serial-file"); + DO_TEST("serial-device"); + DO_TEST("serial-pipe-client-app"); + DO_TEST("serial-pipe-server-vm"); + DO_TEST("serial-network-server"); + DO_TEST("serial-network-client"); - DO_TEST("parallel-file", "parallel-file"); - DO_TEST("parallel-device", "parallel-device"); + DO_TEST("parallel-file"); + DO_TEST("parallel-device"); - DO_TEST("esx-in-the-wild-1", "esx-in-the-wild-1"); - DO_TEST("esx-in-the-wild-2", "esx-in-the-wild-2"); - DO_TEST("esx-in-the-wild-3", "esx-in-the-wild-3"); - DO_TEST("esx-in-the-wild-4", "esx-in-the-wild-4"); - DO_TEST("esx-in-the-wild-5", "esx-in-the-wild-5"); - DO_TEST("esx-in-the-wild-6", "esx-in-the-wild-6"); - DO_TEST("esx-in-the-wild-7", "esx-in-the-wild-7"); - DO_TEST("esx-in-the-wild-8", "esx-in-the-wild-8"); - DO_TEST("esx-in-the-wild-9", "esx-in-the-wild-9"); - DO_TEST("esx-in-the-wild-10", "esx-in-the-wild-10"); - DO_TEST("esx-in-the-wild-11", "esx-in-the-wild-11"); + DO_TEST("esx-in-the-wild-1"); + DO_TEST("esx-in-the-wild-2"); + DO_TEST("esx-in-the-wild-3"); + DO_TEST("esx-in-the-wild-4"); + DO_TEST("esx-in-the-wild-5"); + DO_TEST("esx-in-the-wild-6"); + DO_TEST("esx-in-the-wild-7"); + DO_TEST("esx-in-the-wild-8"); + DO_TEST("esx-in-the-wild-9"); + DO_TEST("esx-in-the-wild-10"); + DO_TEST("esx-in-the-wild-11"); - DO_TEST("gsx-in-the-wild-1", "gsx-in-the-wild-1"); - DO_TEST("gsx-in-the-wild-2", "gsx-in-the-wild-2"); - DO_TEST("gsx-in-the-wild-3", "gsx-in-the-wild-3"); - DO_TEST("gsx-in-the-wild-4", "gsx-in-the-wild-4"); + DO_TEST("gsx-in-the-wild-1"); + DO_TEST("gsx-in-the-wild-2"); + DO_TEST("gsx-in-the-wild-3"); + DO_TEST("gsx-in-the-wild-4"); - DO_TEST("ws-in-the-wild-1", "ws-in-the-wild-1"); - DO_TEST("ws-in-the-wild-2", "ws-in-the-wild-2"); + DO_TEST("ws-in-the-wild-1"); + DO_TEST("ws-in-the-wild-2"); - DO_TEST("fusion-in-the-wild-1", "fusion-in-the-wild-1"); + DO_TEST("fusion-in-the-wild-1"); - DO_TEST("annotation", "annotation"); + DO_TEST("annotation"); - DO_TEST("smbios", "smbios"); + DO_TEST("smbios"); - DO_TEST("svga", "svga"); + DO_TEST("svga"); - DO_TEST("firmware-efi", "firmware-efi"); + DO_TEST("firmware-efi"); ctx.datacenterPath = "folder1/folder2/datacenter1"; - DO_TEST("datacenterpath", "datacenterpath"); + DO_TEST("datacenterpath"); virObjectUnref(caps); virObjectUnref(xmlopt); -- 2.31.1
These XMLs live in a separate directory, there's no need for them to have a special prefix in addition. Dinding proper file based on vmx2xmltest.c is also needlessly complicated. The steps used for mass rename are similar to v4.0.0-rc1~186. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- tests/vmx2xmldata/{vmx2xml-annotation.vmx => annotation.vmx} | 0 tests/vmx2xmldata/{vmx2xml-annotation.xml => annotation.xml} | 0 ...{vmx2xml-case-insensitive-1.vmx => case-insensitive-1.vmx} | 0 ...{vmx2xml-case-insensitive-1.xml => case-insensitive-1.xml} | 0 ...{vmx2xml-case-insensitive-2.vmx => case-insensitive-2.vmx} | 0 ...{vmx2xml-case-insensitive-2.xml => case-insensitive-2.xml} | 0 .../{vmx2xml-cdrom-ide-device.vmx => cdrom-ide-device.vmx} | 0 .../{vmx2xml-cdrom-ide-device.xml => cdrom-ide-device.xml} | 0 .../{vmx2xml-cdrom-ide-empty-2.vmx => cdrom-ide-empty-2.vmx} | 0 .../{vmx2xml-cdrom-ide-empty-2.xml => cdrom-ide-empty-2.xml} | 0 .../{vmx2xml-cdrom-ide-empty.vmx => cdrom-ide-empty.vmx} | 0 .../{vmx2xml-cdrom-ide-empty.xml => cdrom-ide-empty.xml} | 0 ...ing-datastore.vmx => cdrom-ide-file-missing-datastore.vmx} | 0 tests/vmx2xmldata/cdrom-ide-file-missing-datastore.xml | 1 + ...-file-missing-file.vmx => cdrom-ide-file-missing-file.vmx} | 0 tests/vmx2xmldata/cdrom-ide-file-missing-file.xml | 1 + .../{vmx2xml-cdrom-ide-file.vmx => cdrom-ide-file.vmx} | 0 .../{vmx2xml-cdrom-ide-file.xml => cdrom-ide-file.xml} | 0 ...-ide-raw-auto-detect.vmx => cdrom-ide-raw-auto-detect.vmx} | 0 ...-ide-raw-auto-detect.xml => cdrom-ide-raw-auto-detect.xml} | 0 ...2xml-cdrom-ide-raw-device.vmx => cdrom-ide-raw-device.vmx} | 0 ...2xml-cdrom-ide-raw-device.xml => cdrom-ide-raw-device.xml} | 0 .../{vmx2xml-cdrom-scsi-device.vmx => cdrom-scsi-device.vmx} | 0 .../{vmx2xml-cdrom-scsi-device.xml => cdrom-scsi-device.xml} | 0 .../{vmx2xml-cdrom-scsi-empty.vmx => cdrom-scsi-empty.vmx} | 0 .../{vmx2xml-cdrom-scsi-empty.xml => cdrom-scsi-empty.xml} | 0 .../{vmx2xml-cdrom-scsi-file.vmx => cdrom-scsi-file.vmx} | 0 .../{vmx2xml-cdrom-scsi-file.xml => cdrom-scsi-file.xml} | 0 ...mx2xml-cdrom-scsi-passthru.vmx => cdrom-scsi-passthru.vmx} | 0 ...mx2xml-cdrom-scsi-passthru.xml => cdrom-scsi-passthru.xml} | 0 ...csi-raw-auto-detect.vmx => cdrom-scsi-raw-auto-detect.vmx} | 0 ...csi-raw-auto-detect.xml => cdrom-scsi-raw-auto-detect.xml} | 0 ...ml-cdrom-scsi-raw-device.vmx => cdrom-scsi-raw-device.vmx} | 0 ...ml-cdrom-scsi-raw-device.xml => cdrom-scsi-raw-device.xml} | 0 .../{vmx2xml-datacenterpath.vmx => datacenterpath.vmx} | 0 .../{vmx2xml-datacenterpath.xml => datacenterpath.xml} | 0 .../{vmx2xml-esx-in-the-wild-1.vmx => esx-in-the-wild-1.vmx} | 0 .../{vmx2xml-esx-in-the-wild-1.xml => esx-in-the-wild-1.xml} | 0 ...{vmx2xml-esx-in-the-wild-10.vmx => esx-in-the-wild-10.vmx} | 0 ...{vmx2xml-esx-in-the-wild-10.xml => esx-in-the-wild-10.xml} | 0 ...{vmx2xml-esx-in-the-wild-11.vmx => esx-in-the-wild-11.vmx} | 0 ...{vmx2xml-esx-in-the-wild-11.xml => esx-in-the-wild-11.xml} | 0 .../{vmx2xml-esx-in-the-wild-2.vmx => esx-in-the-wild-2.vmx} | 0 .../{vmx2xml-esx-in-the-wild-2.xml => esx-in-the-wild-2.xml} | 0 .../{vmx2xml-esx-in-the-wild-3.vmx => esx-in-the-wild-3.vmx} | 0 .../{vmx2xml-esx-in-the-wild-3.xml => esx-in-the-wild-3.xml} | 0 .../{vmx2xml-esx-in-the-wild-4.vmx => esx-in-the-wild-4.vmx} | 0 .../{vmx2xml-esx-in-the-wild-4.xml => esx-in-the-wild-4.xml} | 0 .../{vmx2xml-esx-in-the-wild-5.vmx => esx-in-the-wild-5.vmx} | 0 .../{vmx2xml-esx-in-the-wild-5.xml => esx-in-the-wild-5.xml} | 0 .../{vmx2xml-esx-in-the-wild-6.vmx => esx-in-the-wild-6.vmx} | 0 .../{vmx2xml-esx-in-the-wild-6.xml => esx-in-the-wild-6.xml} | 0 .../{vmx2xml-esx-in-the-wild-7.vmx => esx-in-the-wild-7.vmx} | 0 .../{vmx2xml-esx-in-the-wild-7.xml => esx-in-the-wild-7.xml} | 0 .../{vmx2xml-esx-in-the-wild-8.vmx => esx-in-the-wild-8.vmx} | 0 .../{vmx2xml-esx-in-the-wild-8.xml => esx-in-the-wild-8.xml} | 0 .../{vmx2xml-esx-in-the-wild-9.vmx => esx-in-the-wild-9.vmx} | 0 .../{vmx2xml-esx-in-the-wild-9.xml => esx-in-the-wild-9.xml} | 0 .../{vmx2xml-ethernet-bridged.vmx => ethernet-bridged.vmx} | 0 .../{vmx2xml-ethernet-bridged.xml => ethernet-bridged.xml} | 0 .../{vmx2xml-ethernet-custom.vmx => ethernet-custom.vmx} | 0 .../{vmx2xml-ethernet-custom.xml => ethernet-custom.xml} | 0 .../{vmx2xml-ethernet-e1000.vmx => ethernet-e1000.vmx} | 0 .../{vmx2xml-ethernet-e1000.xml => ethernet-e1000.xml} | 0 ...{vmx2xml-ethernet-generated.vmx => ethernet-generated.vmx} | 0 ...{vmx2xml-ethernet-generated.xml => ethernet-generated.xml} | 0 .../{vmx2xml-ethernet-nat.vmx => ethernet-nat.vmx} | 0 .../{vmx2xml-ethernet-nat.xml => ethernet-nat.xml} | 0 .../{vmx2xml-ethernet-other.vmx => ethernet-other.vmx} | 0 .../{vmx2xml-ethernet-other.xml => ethernet-other.xml} | 0 .../{vmx2xml-ethernet-static.vmx => ethernet-static.vmx} | 0 .../{vmx2xml-ethernet-static.xml => ethernet-static.xml} | 0 .../{vmx2xml-ethernet-vmxnet2.vmx => ethernet-vmxnet2.vmx} | 0 .../{vmx2xml-ethernet-vmxnet2.xml => ethernet-vmxnet2.xml} | 0 .../{vmx2xml-ethernet-vpx.vmx => ethernet-vpx.vmx} | 0 .../{vmx2xml-ethernet-vpx.xml => ethernet-vpx.xml} | 0 .../{vmx2xml-firmware-efi.vmx => firmware-efi.vmx} | 0 .../{vmx2xml-firmware-efi.xml => firmware-efi.xml} | 0 .../{vmx2xml-floppy-device.vmx => floppy-device.vmx} | 0 .../{vmx2xml-floppy-device.xml => floppy-device.xml} | 0 .../vmx2xmldata/{vmx2xml-floppy-file.vmx => floppy-file.vmx} | 0 .../vmx2xmldata/{vmx2xml-floppy-file.xml => floppy-file.xml} | 0 ...2xml-fusion-in-the-wild-1.vmx => fusion-in-the-wild-1.vmx} | 0 ...2xml-fusion-in-the-wild-1.xml => fusion-in-the-wild-1.xml} | 0 .../{vmx2xml-graphics-vnc.vmx => graphics-vnc.vmx} | 0 .../{vmx2xml-graphics-vnc.xml => graphics-vnc.xml} | 0 .../{vmx2xml-gsx-in-the-wild-1.vmx => gsx-in-the-wild-1.vmx} | 0 .../{vmx2xml-gsx-in-the-wild-1.xml => gsx-in-the-wild-1.xml} | 0 .../{vmx2xml-gsx-in-the-wild-2.vmx => gsx-in-the-wild-2.vmx} | 0 .../{vmx2xml-gsx-in-the-wild-2.xml => gsx-in-the-wild-2.xml} | 0 .../{vmx2xml-gsx-in-the-wild-3.vmx => gsx-in-the-wild-3.vmx} | 0 .../{vmx2xml-gsx-in-the-wild-3.xml => gsx-in-the-wild-3.xml} | 0 .../{vmx2xml-gsx-in-the-wild-4.vmx => gsx-in-the-wild-4.vmx} | 0 .../{vmx2xml-gsx-in-the-wild-4.xml => gsx-in-the-wild-4.xml} | 0 ...-datastore.vmx => harddisk-ide-file-missing-datastore.vmx} | 0 .../{vmx2xml-harddisk-ide-file.vmx => harddisk-ide-file.vmx} | 0 .../{vmx2xml-harddisk-ide-file.xml => harddisk-ide-file.xml} | 0 ...e-missing-file.vmx => harddisk-scsi-file-missing-file.vmx} | 0 ...{vmx2xml-harddisk-scsi-file.vmx => harddisk-scsi-file.vmx} | 0 ...{vmx2xml-harddisk-scsi-file.xml => harddisk-scsi-file.xml} | 0 ...{vmx2xml-harddisk-transient.vmx => harddisk-transient.vmx} | 0 ...{vmx2xml-harddisk-transient.xml => harddisk-transient.xml} | 0 .../{vmx2xml-minimal-64bit.vmx => minimal-64bit.vmx} | 0 .../{vmx2xml-minimal-64bit.xml => minimal-64bit.xml} | 0 tests/vmx2xmldata/{vmx2xml-minimal.vmx => minimal.vmx} | 0 tests/vmx2xmldata/{vmx2xml-minimal.xml => minimal.xml} | 0 .../{vmx2xml-parallel-device.vmx => parallel-device.vmx} | 0 .../{vmx2xml-parallel-device.xml => parallel-device.xml} | 0 .../{vmx2xml-parallel-file.vmx => parallel-file.vmx} | 0 .../{vmx2xml-parallel-file.xml => parallel-file.xml} | 0 .../vmx2xmldata/{vmx2xml-scsi-driver.vmx => scsi-driver.vmx} | 0 .../vmx2xmldata/{vmx2xml-scsi-driver.xml => scsi-driver.xml} | 0 .../{vmx2xml-scsi-writethrough.vmx => scsi-writethrough.vmx} | 0 .../{vmx2xml-scsi-writethrough.xml => scsi-writethrough.xml} | 0 .../{vmx2xml-serial-device.vmx => serial-device.vmx} | 0 .../{vmx2xml-serial-device.xml => serial-device.xml} | 0 .../vmx2xmldata/{vmx2xml-serial-file.vmx => serial-file.vmx} | 0 .../vmx2xmldata/{vmx2xml-serial-file.xml => serial-file.xml} | 0 ...ml-serial-network-client.vmx => serial-network-client.vmx} | 0 ...ml-serial-network-client.xml => serial-network-client.xml} | 0 ...ml-serial-network-server.vmx => serial-network-server.vmx} | 0 ...ml-serial-network-server.xml => serial-network-server.xml} | 0 ...-serial-pipe-client-app.vmx => serial-pipe-client-app.vmx} | 0 tests/vmx2xmldata/serial-pipe-client-app.xml | 1 + ...ml-serial-pipe-client-vm.vmx => serial-pipe-client-vm.vmx} | 0 ...-serial-pipe-server-app.vmx => serial-pipe-server-app.vmx} | 0 ...ml-serial-pipe-server-vm.vmx => serial-pipe-server-vm.vmx} | 0 tests/vmx2xmldata/serial-pipe-server-vm.xml | 1 + .../vmx2xmldata/{vmx2xml-serial-pipe.xml => serial-pipe.xml} | 0 .../{vmx2xml-sharedfolder.vmx => sharedfolder.vmx} | 0 .../{vmx2xml-sharedfolder.xml => sharedfolder.xml} | 0 tests/vmx2xmldata/{vmx2xml-smbios.vmx => smbios.vmx} | 0 tests/vmx2xmldata/{vmx2xml-smbios.xml => smbios.xml} | 0 tests/vmx2xmldata/{vmx2xml-svga.vmx => svga.vmx} | 0 tests/vmx2xmldata/{vmx2xml-svga.xml => svga.xml} | 0 .../vmx2xmldata/vmx2xml-cdrom-ide-file-missing-datastore.xml | 1 - tests/vmx2xmldata/vmx2xml-cdrom-ide-file-missing-file.xml | 1 - tests/vmx2xmldata/vmx2xml-serial-pipe-client-app.xml | 1 - tests/vmx2xmldata/vmx2xml-serial-pipe-server-vm.xml | 1 - .../{vmx2xml-ws-in-the-wild-1.vmx => ws-in-the-wild-1.vmx} | 0 .../{vmx2xml-ws-in-the-wild-1.xml => ws-in-the-wild-1.xml} | 0 .../{vmx2xml-ws-in-the-wild-2.vmx => ws-in-the-wild-2.vmx} | 0 .../{vmx2xml-ws-in-the-wild-2.xml => ws-in-the-wild-2.xml} | 0 tests/vmx2xmltest.c | 4 ++-- 144 files changed, 6 insertions(+), 6 deletions(-) rename tests/vmx2xmldata/{vmx2xml-annotation.vmx => annotation.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-annotation.xml => annotation.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-case-insensitive-1.vmx => case-insensitive-1.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-case-insensitive-1.xml => case-insensitive-1.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-case-insensitive-2.vmx => case-insensitive-2.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-case-insensitive-2.xml => case-insensitive-2.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-cdrom-ide-device.vmx => cdrom-ide-device.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-cdrom-ide-device.xml => cdrom-ide-device.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-cdrom-ide-empty-2.vmx => cdrom-ide-empty-2.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-cdrom-ide-empty-2.xml => cdrom-ide-empty-2.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-cdrom-ide-empty.vmx => cdrom-ide-empty.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-cdrom-ide-empty.xml => cdrom-ide-empty.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-cdrom-ide-file-missing-datastore.vmx => cdrom-ide-file-missing-datastore.vmx} (100%) create mode 120000 tests/vmx2xmldata/cdrom-ide-file-missing-datastore.xml rename tests/vmx2xmldata/{vmx2xml-cdrom-ide-file-missing-file.vmx => cdrom-ide-file-missing-file.vmx} (100%) create mode 120000 tests/vmx2xmldata/cdrom-ide-file-missing-file.xml rename tests/vmx2xmldata/{vmx2xml-cdrom-ide-file.vmx => cdrom-ide-file.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-cdrom-ide-file.xml => cdrom-ide-file.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-cdrom-ide-raw-auto-detect.vmx => cdrom-ide-raw-auto-detect.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-cdrom-ide-raw-auto-detect.xml => cdrom-ide-raw-auto-detect.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-cdrom-ide-raw-device.vmx => cdrom-ide-raw-device.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-cdrom-ide-raw-device.xml => cdrom-ide-raw-device.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-cdrom-scsi-device.vmx => cdrom-scsi-device.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-cdrom-scsi-device.xml => cdrom-scsi-device.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-cdrom-scsi-empty.vmx => cdrom-scsi-empty.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-cdrom-scsi-empty.xml => cdrom-scsi-empty.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-cdrom-scsi-file.vmx => cdrom-scsi-file.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-cdrom-scsi-file.xml => cdrom-scsi-file.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-cdrom-scsi-passthru.vmx => cdrom-scsi-passthru.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-cdrom-scsi-passthru.xml => cdrom-scsi-passthru.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-cdrom-scsi-raw-auto-detect.vmx => cdrom-scsi-raw-auto-detect.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-cdrom-scsi-raw-auto-detect.xml => cdrom-scsi-raw-auto-detect.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-cdrom-scsi-raw-device.vmx => cdrom-scsi-raw-device.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-cdrom-scsi-raw-device.xml => cdrom-scsi-raw-device.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-datacenterpath.vmx => datacenterpath.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-datacenterpath.xml => datacenterpath.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-esx-in-the-wild-1.vmx => esx-in-the-wild-1.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-esx-in-the-wild-1.xml => esx-in-the-wild-1.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-esx-in-the-wild-10.vmx => esx-in-the-wild-10.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-esx-in-the-wild-10.xml => esx-in-the-wild-10.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-esx-in-the-wild-11.vmx => esx-in-the-wild-11.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-esx-in-the-wild-11.xml => esx-in-the-wild-11.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-esx-in-the-wild-2.vmx => esx-in-the-wild-2.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-esx-in-the-wild-2.xml => esx-in-the-wild-2.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-esx-in-the-wild-3.vmx => esx-in-the-wild-3.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-esx-in-the-wild-3.xml => esx-in-the-wild-3.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-esx-in-the-wild-4.vmx => esx-in-the-wild-4.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-esx-in-the-wild-4.xml => esx-in-the-wild-4.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-esx-in-the-wild-5.vmx => esx-in-the-wild-5.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-esx-in-the-wild-5.xml => esx-in-the-wild-5.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-esx-in-the-wild-6.vmx => esx-in-the-wild-6.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-esx-in-the-wild-6.xml => esx-in-the-wild-6.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-esx-in-the-wild-7.vmx => esx-in-the-wild-7.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-esx-in-the-wild-7.xml => esx-in-the-wild-7.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-esx-in-the-wild-8.vmx => esx-in-the-wild-8.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-esx-in-the-wild-8.xml => esx-in-the-wild-8.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-esx-in-the-wild-9.vmx => esx-in-the-wild-9.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-esx-in-the-wild-9.xml => esx-in-the-wild-9.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-ethernet-bridged.vmx => ethernet-bridged.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-ethernet-bridged.xml => ethernet-bridged.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-ethernet-custom.vmx => ethernet-custom.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-ethernet-custom.xml => ethernet-custom.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-ethernet-e1000.vmx => ethernet-e1000.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-ethernet-e1000.xml => ethernet-e1000.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-ethernet-generated.vmx => ethernet-generated.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-ethernet-generated.xml => ethernet-generated.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-ethernet-nat.vmx => ethernet-nat.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-ethernet-nat.xml => ethernet-nat.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-ethernet-other.vmx => ethernet-other.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-ethernet-other.xml => ethernet-other.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-ethernet-static.vmx => ethernet-static.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-ethernet-static.xml => ethernet-static.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-ethernet-vmxnet2.vmx => ethernet-vmxnet2.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-ethernet-vmxnet2.xml => ethernet-vmxnet2.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-ethernet-vpx.vmx => ethernet-vpx.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-ethernet-vpx.xml => ethernet-vpx.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-firmware-efi.vmx => firmware-efi.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-firmware-efi.xml => firmware-efi.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-floppy-device.vmx => floppy-device.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-floppy-device.xml => floppy-device.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-floppy-file.vmx => floppy-file.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-floppy-file.xml => floppy-file.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-fusion-in-the-wild-1.vmx => fusion-in-the-wild-1.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-fusion-in-the-wild-1.xml => fusion-in-the-wild-1.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-graphics-vnc.vmx => graphics-vnc.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-graphics-vnc.xml => graphics-vnc.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-gsx-in-the-wild-1.vmx => gsx-in-the-wild-1.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-gsx-in-the-wild-1.xml => gsx-in-the-wild-1.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-gsx-in-the-wild-2.vmx => gsx-in-the-wild-2.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-gsx-in-the-wild-2.xml => gsx-in-the-wild-2.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-gsx-in-the-wild-3.vmx => gsx-in-the-wild-3.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-gsx-in-the-wild-3.xml => gsx-in-the-wild-3.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-gsx-in-the-wild-4.vmx => gsx-in-the-wild-4.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-gsx-in-the-wild-4.xml => gsx-in-the-wild-4.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-harddisk-ide-file-missing-datastore.vmx => harddisk-ide-file-missing-datastore.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-harddisk-ide-file.vmx => harddisk-ide-file.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-harddisk-ide-file.xml => harddisk-ide-file.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-harddisk-scsi-file-missing-file.vmx => harddisk-scsi-file-missing-file.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-harddisk-scsi-file.vmx => harddisk-scsi-file.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-harddisk-scsi-file.xml => harddisk-scsi-file.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-harddisk-transient.vmx => harddisk-transient.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-harddisk-transient.xml => harddisk-transient.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-minimal-64bit.vmx => minimal-64bit.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-minimal-64bit.xml => minimal-64bit.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-minimal.vmx => minimal.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-minimal.xml => minimal.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-parallel-device.vmx => parallel-device.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-parallel-device.xml => parallel-device.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-parallel-file.vmx => parallel-file.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-parallel-file.xml => parallel-file.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-scsi-driver.vmx => scsi-driver.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-scsi-driver.xml => scsi-driver.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-scsi-writethrough.vmx => scsi-writethrough.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-scsi-writethrough.xml => scsi-writethrough.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-serial-device.vmx => serial-device.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-serial-device.xml => serial-device.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-serial-file.vmx => serial-file.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-serial-file.xml => serial-file.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-serial-network-client.vmx => serial-network-client.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-serial-network-client.xml => serial-network-client.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-serial-network-server.vmx => serial-network-server.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-serial-network-server.xml => serial-network-server.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-serial-pipe-client-app.vmx => serial-pipe-client-app.vmx} (100%) create mode 120000 tests/vmx2xmldata/serial-pipe-client-app.xml rename tests/vmx2xmldata/{vmx2xml-serial-pipe-client-vm.vmx => serial-pipe-client-vm.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-serial-pipe-server-app.vmx => serial-pipe-server-app.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-serial-pipe-server-vm.vmx => serial-pipe-server-vm.vmx} (100%) create mode 120000 tests/vmx2xmldata/serial-pipe-server-vm.xml rename tests/vmx2xmldata/{vmx2xml-serial-pipe.xml => serial-pipe.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-sharedfolder.vmx => sharedfolder.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-sharedfolder.xml => sharedfolder.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-smbios.vmx => smbios.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-smbios.xml => smbios.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-svga.vmx => svga.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-svga.xml => svga.xml} (100%) delete mode 120000 tests/vmx2xmldata/vmx2xml-cdrom-ide-file-missing-datastore.xml delete mode 120000 tests/vmx2xmldata/vmx2xml-cdrom-ide-file-missing-file.xml delete mode 120000 tests/vmx2xmldata/vmx2xml-serial-pipe-client-app.xml delete mode 120000 tests/vmx2xmldata/vmx2xml-serial-pipe-server-vm.xml rename tests/vmx2xmldata/{vmx2xml-ws-in-the-wild-1.vmx => ws-in-the-wild-1.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-ws-in-the-wild-1.xml => ws-in-the-wild-1.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-ws-in-the-wild-2.vmx => ws-in-the-wild-2.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-ws-in-the-wild-2.xml => ws-in-the-wild-2.xml} (100%) 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); -- 2.31.1
On a Wednesday in 2021, Michal Privoznik wrote:
You can find these also here:
https://gitlab.com/MichalPrivoznik/libvirt/-/tree/vmx_floppy
Michal Prívozník (3): vmx2xmltest: Drop duplicate testcases vmx2xmltest: Deduplicate DO_TEST*() arguments tests: Drop vmx2xml- prefix for vmx2xml test cases
...{vmx2xml-annotation.vmx => annotation.vmx} | 0 ...{vmx2xml-annotation.xml => annotation.xml} | 0
[...]
...in-the-wild-2.vmx => ws-in-the-wild-2.vmx} | 0 ...in-the-wild-2.xml => ws-in-the-wild-2.xml} | 0 tests/vmx2xmltest.c | 206 +++++++++--------- 140 files changed, 105 insertions(+), 105 deletions(-) rename tests/vmx2xmldata/{vmx2xml-annotation.vmx => annotation.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-annotation.xml => annotation.xml} (100%)
[...]
rename tests/vmx2xmldata/{vmx2xml-ws-in-the-wild-2.vmx => ws-in-the-wild-2.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-ws-in-the-wild-2.xml => ws-in-the-wild-2.xml} (100%)
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
On Wed, Aug 18, 2021 at 03:51:09PM +0200, Michal Privoznik wrote:
You can find these also here:
https://gitlab.com/MichalPrivoznik/libvirt/-/tree/vmx_floppy
Michal Prívozník (3): vmx2xmltest: Drop duplicate testcases vmx2xmltest: Deduplicate DO_TEST*() arguments tests: Drop vmx2xml- prefix for vmx2xml test cases
Series looks fine apart from the first patch that could actually lead to us losing track of the missing test. Since this patch series is not actually related to that I'll fix that one after you push this. Reviewed-by: Martin Kletzander <mkletzan@redhat.com>
participants (3)
-
Ján Tomko -
Martin Kletzander -
Michal Privoznik