From nobody Thu May 2 05:13:58 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1629294690; cv=none; d=zohomail.com; s=zohoarc; b=aul5J0L+NNVx4ZN580mqBDAGAxCEGG2arg256LQvmg+BRakXyMC81XXwDgHR1dQEgmTZryd0fx9r8STPvFAgaPiq3fdsZB7t4O4C+i2vp9CNxoQi1IckG9spUE6UR2nqWJdx5At5+S0earP5419qVYBXJHgeVJy/gEe2LDcJWCI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1629294690; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=mcywOALFc9QvokPHV+Ck2QjRJ1nFWXYkmdk4XQdmCtU=; b=jHd99WLc0R8QlRCh/F9vnnqb6C3LTyqs86fTCW7VGQ1gY4a3ya5/xgpJh+cWM8kdzJwonm+C18CzqjngK5EcL8+Q73oIw16Wvx+zrjHZr0AUjYdwxLx6gNE+hjb9NdSFvMbHN2E1cSwrUnKvTVrRHI9RXGmDFjotT0VQcuTaIlo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1629294690470251.45824334109477; Wed, 18 Aug 2021 06:51:30 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-489-Rid8qCYOMTm5W9mYqccu8w-1; Wed, 18 Aug 2021 09:51:26 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id BC9F61019637; Wed, 18 Aug 2021 13:51:21 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9F362369A; Wed, 18 Aug 2021 13:51:21 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 17CB6182188A; Wed, 18 Aug 2021 13:51:21 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 17IDpJeF007085 for ; Wed, 18 Aug 2021 09:51:19 -0400 Received: by smtp.corp.redhat.com (Postfix) id 8411813905; Wed, 18 Aug 2021 13:51:19 +0000 (UTC) Received: from bart.redhat.com (unknown [10.43.2.192]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0E22860C81 for ; Wed, 18 Aug 2021 13:51:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1629294689; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=mcywOALFc9QvokPHV+Ck2QjRJ1nFWXYkmdk4XQdmCtU=; b=U4ksw26jk3hp/o/xSnjMgGG0nP1KV8/w/Ikj/hOFBO0VxQYvZ3yUewQOdH0EAsRlJYcGxJ 0jl9l8RYLlRFky4mukwWcKFjaPoGvPuEk2CWR9p620pY4nAnDefPpYPyzrYIk4xGAhVgMS LXDejqe1Bz37PJLIpey/LDsdH48r34M= X-MC-Unique: Rid8qCYOMTm5W9mYqccu8w-1 From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 1/3] vmx2xmltest: Drop duplicate testcases Date: Wed, 18 Aug 2021 15:51:10 +0200 Message-Id: <7a42ab9b323b279d8826bdf2491235e303d766e0.1629294559.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1629294691638100003 Content-Type: text/plain; charset="utf-8" There are three test cases are called twice. This is needless. Drop redundant calls. Signed-off-by: Michal Privoznik Reviewed-by: J=C3=A1n Tomko Reviewed-by: Martin Kletzander --- 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"); =20 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"); =20 --=20 2.31.1 From nobody Thu May 2 05:13:58 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1629294698; cv=none; d=zohomail.com; s=zohoarc; b=BogX3ORl4gr/EJqH4YqxrU0H5Vp9E+Ss5rcuGBoudjp+fPEEJNVS+7buP77I3UYYwe5a6iuXHgkQZXIrGJt36/x3hVsp9WcKbsz1k1r1Kh3GrJR2BQ2Dd0RTuTZ44l7FNuZiYd17NfF6iWq369Sanb/fBbhcKn7T37JoQMvUGVY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1629294698; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=uuWc6bgIjpbz/UUXC1l4iQeaNt1AvRuq1c/hpFtTCTE=; b=TsPN0yEaoOdLd+PScR2Zy8pQi9Okth9/1J0C4stXQVw0FTdL5VFaxM9WgSW5ErCRW5whFPeulBEZtKwgXS/YpePOYd3SLBjTu91hi6DZGIy9FzhILUct0hIwnuK1nKzzn0GLKNC5EUFB7/sSo/actE0eI/Bcnuo2BvnJTpzmeEU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1629294698969131.4781082781916; Wed, 18 Aug 2021 06:51:38 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-314-Px-Qa_sBOd6mG-rRxcyDyg-1; Wed, 18 Aug 2021 09:51:36 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E3B56192D787; Wed, 18 Aug 2021 13:51:26 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C31795D9DE; Wed, 18 Aug 2021 13:51:26 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 91FD05002D; Wed, 18 Aug 2021 13:51:26 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 17IDpKqC007095 for ; Wed, 18 Aug 2021 09:51:20 -0400 Received: by smtp.corp.redhat.com (Postfix) id 5232460C81; Wed, 18 Aug 2021 13:51:20 +0000 (UTC) Received: from bart.redhat.com (unknown [10.43.2.192]) by smtp.corp.redhat.com (Postfix) with ESMTP id D0D0861096 for ; Wed, 18 Aug 2021 13:51:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1629294697; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=uuWc6bgIjpbz/UUXC1l4iQeaNt1AvRuq1c/hpFtTCTE=; b=JleMgXc5/V+qOKQsSzBI8QiYMvaV+DNNmYPg5UjPBccPInduq7ssEBNEw56c7UxgLc2ybP 5lyeQ+3kYwsdhFWNAAz+Lpi+umXRuliXzC+Xh+VTOAhaVr1eSZd9BcWsJ8S1mrxog1kHYe Ev4DMedHBWX08rhJMoU42JxgkyHHo0E= X-MC-Unique: Px-Qa_sBOd6mG-rRxcyDyg-1 From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 2/3] vmx2xmltest: Deduplicate DO_TEST*() arguments Date: Wed, 18 Aug 2021 15:51:11 +0200 Message-Id: <89024ec6bfb07e69149028cc21fc4c88178435a3.1629294559.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1629294700571100001 Content-Type: text/plain; charset="utf-8" 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 Reviewed-by: J=C3=A1n Tomko Reviewed-by: Martin Kletzander --- ...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-datast= ore.xml create mode 120000 tests/vmx2xmldata/vmx2xml-cdrom-ide-file-missing-file.x= ml 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/te= sts/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/v= mx2xmldata/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/vm= x2xmldata/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) } =20 struct testInfo { - const char *input; - const char *output; + const char *file; bool should_fail; }; =20 @@ -124,9 +123,9 @@ testCompareHelper(const void *data) char *xml =3D NULL; =20 vmx =3D g_strdup_printf("%s/vmx2xmldata/vmx2xml-%s.vmx", abs_srcdir, - info->input); + info->file); xml =3D g_strdup_printf("%s/vmx2xmldata/vmx2xml-%s.xml", abs_srcdir, - info->output); + info->file); =20 ret =3D testCompareFiles(vmx, xml, info->should_fail); =20 @@ -191,18 +190,18 @@ mymain(void) { int ret =3D 0; =20 -# define DO_TEST_FULL(_in, _out, _should_fail) \ +# define DO_TEST_FULL(file, should_fail) \ do { \ - struct testInfo info =3D { _in, _out, _should_fail }; \ + struct testInfo info =3D { file, should_fail }; \ virResetLastError(); \ - if (virTestRun("VMware VMX-2-XML "_in" -> "_out, \ + if (virTestRun("VMware VMX-2-XML " file, \ testCompareHelper, &info) < 0) { \ ret =3D -1; \ } \ } while (0) =20 -# 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) =20 testCapsInit(); =20 @@ -218,100 +217,100 @@ mymain(void) ctx.autodetectSCSIControllerModel =3D NULL; ctx.datacenterPath =3D NULL; =20 - 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"); =20 - DO_TEST("minimal", "minimal"); - DO_TEST("minimal-64bit", "minimal-64bit"); + DO_TEST("minimal"); + DO_TEST("minimal-64bit"); =20 - DO_TEST("graphics-vnc", "graphics-vnc"); + DO_TEST("graphics-vnc"); =20 - DO_TEST("scsi-driver", "scsi-driver"); - DO_TEST("scsi-writethrough", "scsi-writethrough"); + DO_TEST("scsi-driver"); + DO_TEST("scsi-writethrough"); =20 - 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"); =20 - 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"); =20 - 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"); =20 - 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"); =20 - DO_TEST("floppy-file", "floppy-file"); - DO_TEST("floppy-device", "floppy-device"); + DO_TEST("floppy-file"); + DO_TEST("floppy-device"); =20 - DO_TEST("sharedfolder", "sharedfolder"); + DO_TEST("sharedfolder"); =20 - DO_TEST("ethernet-e1000", "ethernet-e1000"); - DO_TEST("ethernet-vmxnet2", "ethernet-vmxnet2"); + DO_TEST("ethernet-e1000"); + DO_TEST("ethernet-vmxnet2"); =20 - 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"); =20 - 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"); =20 - 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"); =20 - DO_TEST("parallel-file", "parallel-file"); - DO_TEST("parallel-device", "parallel-device"); + DO_TEST("parallel-file"); + DO_TEST("parallel-device"); =20 - 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"); =20 - 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"); =20 - 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"); =20 - DO_TEST("fusion-in-the-wild-1", "fusion-in-the-wild-1"); + DO_TEST("fusion-in-the-wild-1"); =20 - DO_TEST("annotation", "annotation"); + DO_TEST("annotation"); =20 - DO_TEST("smbios", "smbios"); + DO_TEST("smbios"); =20 - DO_TEST("svga", "svga"); + DO_TEST("svga"); =20 - DO_TEST("firmware-efi", "firmware-efi"); + DO_TEST("firmware-efi"); =20 ctx.datacenterPath =3D "folder1/folder2/datacenter1"; =20 - DO_TEST("datacenterpath", "datacenterpath"); + DO_TEST("datacenterpath"); =20 virObjectUnref(caps); virObjectUnref(xmlopt); --=20 2.31.1 From nobody Thu May 2 05:13:58 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1629294699; cv=none; d=zohomail.com; s=zohoarc; b=BSEgRTHCN8fIU79OUuMHDCciMKw6wGUxkY68DT2B6URAKeMXLv01gbcnMpl6HyWENqa+nmwkJ6yG1JMBAFqhjqcMe7y8ckjwUZTKa9iO41PqNEUE9yEYxju47NDQEtBv2+w1yUcIwKI7C9aTk0/LtdMpOV3fZVyhBp+U2NpJDmY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1629294699; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=kiqAazWpFpGigcmxWioAMGGWMKoNIzHUUqae7QPvTkw=; b=h1OLvCn7VxziGdAKZEQAQtbreJzAHTx1FSlV8eeX+74X9MsRoRMihJ8N1SSdP22o3ZLCo+xeT0jNBRJSXYdJScGWVHseowDhUYAlBqJxlxkum1MCwlI1Jat45TDu48SUHPrHHDxC0VEbcmRYZkVmpcF2EbwrnHpcmOni7XoAyRc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1629294699058113.38587127622873; Wed, 18 Aug 2021 06:51:39 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-194-D8cDSKWJN8S6DF0Wnt33uA-1; Wed, 18 Aug 2021 09:51:34 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id EC2F7802C98; Wed, 18 Aug 2021 13:51:29 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B0D6D5DD68; Wed, 18 Aug 2021 13:51:29 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 7E0FE50039; Wed, 18 Aug 2021 13:51:29 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 17IDpLD4007104 for ; Wed, 18 Aug 2021 09:51:21 -0400 Received: by smtp.corp.redhat.com (Postfix) id 6C90613905; Wed, 18 Aug 2021 13:51:21 +0000 (UTC) Received: from bart.redhat.com (unknown [10.43.2.192]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9F3E460C81 for ; Wed, 18 Aug 2021 13:51:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1629294697; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=kiqAazWpFpGigcmxWioAMGGWMKoNIzHUUqae7QPvTkw=; b=OQNg8pCn485x5kn2JQOc3jdxCvu5/+M+7kfyrZ5fhpYlgKDTjoaon6b/6RmbzPs7g7Uhrf dBcpMJpqAG1BUKSY2bXI6LZlbWx94FSSdQR8euvIOlVbWVNzZ8Eoe9BmgQxcaXS9wzT/O0 dMmsuPkWW3gQkd+sTIjfKG6BJ9CkNsg= X-MC-Unique: D8cDSKWJN8S6DF0Wnt33uA-1 From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 3/3] tests: Drop vmx2xml- prefix for vmx2xml test cases Date: Wed, 18 Aug 2021 15:51:12 +0200 Message-Id: <19887dd783b592e09e7ec234fa2dc62c7ae045fd.1629294559.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1629294700621100002 Content-Type: text/plain; charset="utf-8" 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 Reviewed-by: J=C3=A1n Tomko Reviewed-by: Martin Kletzander --- tests/vmx2xmldata/{vmx2xml-annotation.vmx =3D> annotation.vmx} | 0 tests/vmx2xmldata/{vmx2xml-annotation.xml =3D> annotation.xml} | 0 ...{vmx2xml-case-insensitive-1.vmx =3D> case-insensitive-1.vmx} | 0 ...{vmx2xml-case-insensitive-1.xml =3D> case-insensitive-1.xml} | 0 ...{vmx2xml-case-insensitive-2.vmx =3D> case-insensitive-2.vmx} | 0 ...{vmx2xml-case-insensitive-2.xml =3D> case-insensitive-2.xml} | 0 .../{vmx2xml-cdrom-ide-device.vmx =3D> cdrom-ide-device.vmx} | 0 .../{vmx2xml-cdrom-ide-device.xml =3D> cdrom-ide-device.xml} | 0 .../{vmx2xml-cdrom-ide-empty-2.vmx =3D> cdrom-ide-empty-2.vmx} | 0 .../{vmx2xml-cdrom-ide-empty-2.xml =3D> cdrom-ide-empty-2.xml} | 0 .../{vmx2xml-cdrom-ide-empty.vmx =3D> cdrom-ide-empty.vmx} | 0 .../{vmx2xml-cdrom-ide-empty.xml =3D> cdrom-ide-empty.xml} | 0 ...ing-datastore.vmx =3D> cdrom-ide-file-missing-datastore.vmx} | 0 tests/vmx2xmldata/cdrom-ide-file-missing-datastore.xml | 1 + ...-file-missing-file.vmx =3D> cdrom-ide-file-missing-file.vmx} | 0 tests/vmx2xmldata/cdrom-ide-file-missing-file.xml | 1 + .../{vmx2xml-cdrom-ide-file.vmx =3D> cdrom-ide-file.vmx} | 0 .../{vmx2xml-cdrom-ide-file.xml =3D> cdrom-ide-file.xml} | 0 ...-ide-raw-auto-detect.vmx =3D> cdrom-ide-raw-auto-detect.vmx} | 0 ...-ide-raw-auto-detect.xml =3D> cdrom-ide-raw-auto-detect.xml} | 0 ...2xml-cdrom-ide-raw-device.vmx =3D> cdrom-ide-raw-device.vmx} | 0 ...2xml-cdrom-ide-raw-device.xml =3D> cdrom-ide-raw-device.xml} | 0 .../{vmx2xml-cdrom-scsi-device.vmx =3D> cdrom-scsi-device.vmx} | 0 .../{vmx2xml-cdrom-scsi-device.xml =3D> cdrom-scsi-device.xml} | 0 .../{vmx2xml-cdrom-scsi-empty.vmx =3D> cdrom-scsi-empty.vmx} | 0 .../{vmx2xml-cdrom-scsi-empty.xml =3D> cdrom-scsi-empty.xml} | 0 .../{vmx2xml-cdrom-scsi-file.vmx =3D> cdrom-scsi-file.vmx} | 0 .../{vmx2xml-cdrom-scsi-file.xml =3D> cdrom-scsi-file.xml} | 0 ...mx2xml-cdrom-scsi-passthru.vmx =3D> cdrom-scsi-passthru.vmx} | 0 ...mx2xml-cdrom-scsi-passthru.xml =3D> cdrom-scsi-passthru.xml} | 0 ...csi-raw-auto-detect.vmx =3D> cdrom-scsi-raw-auto-detect.vmx} | 0 ...csi-raw-auto-detect.xml =3D> cdrom-scsi-raw-auto-detect.xml} | 0 ...ml-cdrom-scsi-raw-device.vmx =3D> cdrom-scsi-raw-device.vmx} | 0 ...ml-cdrom-scsi-raw-device.xml =3D> cdrom-scsi-raw-device.xml} | 0 .../{vmx2xml-datacenterpath.vmx =3D> datacenterpath.vmx} | 0 .../{vmx2xml-datacenterpath.xml =3D> datacenterpath.xml} | 0 .../{vmx2xml-esx-in-the-wild-1.vmx =3D> esx-in-the-wild-1.vmx} | 0 .../{vmx2xml-esx-in-the-wild-1.xml =3D> esx-in-the-wild-1.xml} | 0 ...{vmx2xml-esx-in-the-wild-10.vmx =3D> esx-in-the-wild-10.vmx} | 0 ...{vmx2xml-esx-in-the-wild-10.xml =3D> esx-in-the-wild-10.xml} | 0 ...{vmx2xml-esx-in-the-wild-11.vmx =3D> esx-in-the-wild-11.vmx} | 0 ...{vmx2xml-esx-in-the-wild-11.xml =3D> esx-in-the-wild-11.xml} | 0 .../{vmx2xml-esx-in-the-wild-2.vmx =3D> esx-in-the-wild-2.vmx} | 0 .../{vmx2xml-esx-in-the-wild-2.xml =3D> esx-in-the-wild-2.xml} | 0 .../{vmx2xml-esx-in-the-wild-3.vmx =3D> esx-in-the-wild-3.vmx} | 0 .../{vmx2xml-esx-in-the-wild-3.xml =3D> esx-in-the-wild-3.xml} | 0 .../{vmx2xml-esx-in-the-wild-4.vmx =3D> esx-in-the-wild-4.vmx} | 0 .../{vmx2xml-esx-in-the-wild-4.xml =3D> esx-in-the-wild-4.xml} | 0 .../{vmx2xml-esx-in-the-wild-5.vmx =3D> esx-in-the-wild-5.vmx} | 0 .../{vmx2xml-esx-in-the-wild-5.xml =3D> esx-in-the-wild-5.xml} | 0 .../{vmx2xml-esx-in-the-wild-6.vmx =3D> esx-in-the-wild-6.vmx} | 0 .../{vmx2xml-esx-in-the-wild-6.xml =3D> esx-in-the-wild-6.xml} | 0 .../{vmx2xml-esx-in-the-wild-7.vmx =3D> esx-in-the-wild-7.vmx} | 0 .../{vmx2xml-esx-in-the-wild-7.xml =3D> esx-in-the-wild-7.xml} | 0 .../{vmx2xml-esx-in-the-wild-8.vmx =3D> esx-in-the-wild-8.vmx} | 0 .../{vmx2xml-esx-in-the-wild-8.xml =3D> esx-in-the-wild-8.xml} | 0 .../{vmx2xml-esx-in-the-wild-9.vmx =3D> esx-in-the-wild-9.vmx} | 0 .../{vmx2xml-esx-in-the-wild-9.xml =3D> esx-in-the-wild-9.xml} | 0 .../{vmx2xml-ethernet-bridged.vmx =3D> ethernet-bridged.vmx} | 0 .../{vmx2xml-ethernet-bridged.xml =3D> ethernet-bridged.xml} | 0 .../{vmx2xml-ethernet-custom.vmx =3D> ethernet-custom.vmx} | 0 .../{vmx2xml-ethernet-custom.xml =3D> ethernet-custom.xml} | 0 .../{vmx2xml-ethernet-e1000.vmx =3D> ethernet-e1000.vmx} | 0 .../{vmx2xml-ethernet-e1000.xml =3D> ethernet-e1000.xml} | 0 ...{vmx2xml-ethernet-generated.vmx =3D> ethernet-generated.vmx} | 0 ...{vmx2xml-ethernet-generated.xml =3D> ethernet-generated.xml} | 0 .../{vmx2xml-ethernet-nat.vmx =3D> ethernet-nat.vmx} | 0 .../{vmx2xml-ethernet-nat.xml =3D> ethernet-nat.xml} | 0 .../{vmx2xml-ethernet-other.vmx =3D> ethernet-other.vmx} | 0 .../{vmx2xml-ethernet-other.xml =3D> ethernet-other.xml} | 0 .../{vmx2xml-ethernet-static.vmx =3D> ethernet-static.vmx} | 0 .../{vmx2xml-ethernet-static.xml =3D> ethernet-static.xml} | 0 .../{vmx2xml-ethernet-vmxnet2.vmx =3D> ethernet-vmxnet2.vmx} | 0 .../{vmx2xml-ethernet-vmxnet2.xml =3D> ethernet-vmxnet2.xml} | 0 .../{vmx2xml-ethernet-vpx.vmx =3D> ethernet-vpx.vmx} | 0 .../{vmx2xml-ethernet-vpx.xml =3D> ethernet-vpx.xml} | 0 .../{vmx2xml-firmware-efi.vmx =3D> firmware-efi.vmx} | 0 .../{vmx2xml-firmware-efi.xml =3D> firmware-efi.xml} | 0 .../{vmx2xml-floppy-device.vmx =3D> floppy-device.vmx} | 0 .../{vmx2xml-floppy-device.xml =3D> floppy-device.xml} | 0 .../vmx2xmldata/{vmx2xml-floppy-file.vmx =3D> floppy-file.vmx} | 0 .../vmx2xmldata/{vmx2xml-floppy-file.xml =3D> floppy-file.xml} | 0 ...2xml-fusion-in-the-wild-1.vmx =3D> fusion-in-the-wild-1.vmx} | 0 ...2xml-fusion-in-the-wild-1.xml =3D> fusion-in-the-wild-1.xml} | 0 .../{vmx2xml-graphics-vnc.vmx =3D> graphics-vnc.vmx} | 0 .../{vmx2xml-graphics-vnc.xml =3D> graphics-vnc.xml} | 0 .../{vmx2xml-gsx-in-the-wild-1.vmx =3D> gsx-in-the-wild-1.vmx} | 0 .../{vmx2xml-gsx-in-the-wild-1.xml =3D> gsx-in-the-wild-1.xml} | 0 .../{vmx2xml-gsx-in-the-wild-2.vmx =3D> gsx-in-the-wild-2.vmx} | 0 .../{vmx2xml-gsx-in-the-wild-2.xml =3D> gsx-in-the-wild-2.xml} | 0 .../{vmx2xml-gsx-in-the-wild-3.vmx =3D> gsx-in-the-wild-3.vmx} | 0 .../{vmx2xml-gsx-in-the-wild-3.xml =3D> gsx-in-the-wild-3.xml} | 0 .../{vmx2xml-gsx-in-the-wild-4.vmx =3D> gsx-in-the-wild-4.vmx} | 0 .../{vmx2xml-gsx-in-the-wild-4.xml =3D> gsx-in-the-wild-4.xml} | 0 ...-datastore.vmx =3D> harddisk-ide-file-missing-datastore.vmx} | 0 .../{vmx2xml-harddisk-ide-file.vmx =3D> harddisk-ide-file.vmx} | 0 .../{vmx2xml-harddisk-ide-file.xml =3D> harddisk-ide-file.xml} | 0 ...e-missing-file.vmx =3D> harddisk-scsi-file-missing-file.vmx} | 0 ...{vmx2xml-harddisk-scsi-file.vmx =3D> harddisk-scsi-file.vmx} | 0 ...{vmx2xml-harddisk-scsi-file.xml =3D> harddisk-scsi-file.xml} | 0 ...{vmx2xml-harddisk-transient.vmx =3D> harddisk-transient.vmx} | 0 ...{vmx2xml-harddisk-transient.xml =3D> harddisk-transient.xml} | 0 .../{vmx2xml-minimal-64bit.vmx =3D> minimal-64bit.vmx} | 0 .../{vmx2xml-minimal-64bit.xml =3D> minimal-64bit.xml} | 0 tests/vmx2xmldata/{vmx2xml-minimal.vmx =3D> minimal.vmx} | 0 tests/vmx2xmldata/{vmx2xml-minimal.xml =3D> minimal.xml} | 0 .../{vmx2xml-parallel-device.vmx =3D> parallel-device.vmx} | 0 .../{vmx2xml-parallel-device.xml =3D> parallel-device.xml} | 0 .../{vmx2xml-parallel-file.vmx =3D> parallel-file.vmx} | 0 .../{vmx2xml-parallel-file.xml =3D> parallel-file.xml} | 0 .../vmx2xmldata/{vmx2xml-scsi-driver.vmx =3D> scsi-driver.vmx} | 0 .../vmx2xmldata/{vmx2xml-scsi-driver.xml =3D> scsi-driver.xml} | 0 .../{vmx2xml-scsi-writethrough.vmx =3D> scsi-writethrough.vmx} | 0 .../{vmx2xml-scsi-writethrough.xml =3D> scsi-writethrough.xml} | 0 .../{vmx2xml-serial-device.vmx =3D> serial-device.vmx} | 0 .../{vmx2xml-serial-device.xml =3D> serial-device.xml} | 0 .../vmx2xmldata/{vmx2xml-serial-file.vmx =3D> serial-file.vmx} | 0 .../vmx2xmldata/{vmx2xml-serial-file.xml =3D> serial-file.xml} | 0 ...ml-serial-network-client.vmx =3D> serial-network-client.vmx} | 0 ...ml-serial-network-client.xml =3D> serial-network-client.xml} | 0 ...ml-serial-network-server.vmx =3D> serial-network-server.vmx} | 0 ...ml-serial-network-server.xml =3D> serial-network-server.xml} | 0 ...-serial-pipe-client-app.vmx =3D> serial-pipe-client-app.vmx} | 0 tests/vmx2xmldata/serial-pipe-client-app.xml | 1 + ...ml-serial-pipe-client-vm.vmx =3D> serial-pipe-client-vm.vmx} | 0 ...-serial-pipe-server-app.vmx =3D> serial-pipe-server-app.vmx} | 0 ...ml-serial-pipe-server-vm.vmx =3D> serial-pipe-server-vm.vmx} | 0 tests/vmx2xmldata/serial-pipe-server-vm.xml | 1 + .../vmx2xmldata/{vmx2xml-serial-pipe.xml =3D> serial-pipe.xml} | 0 .../{vmx2xml-sharedfolder.vmx =3D> sharedfolder.vmx} | 0 .../{vmx2xml-sharedfolder.xml =3D> sharedfolder.xml} | 0 tests/vmx2xmldata/{vmx2xml-smbios.vmx =3D> smbios.vmx} | 0 tests/vmx2xmldata/{vmx2xml-smbios.xml =3D> smbios.xml} | 0 tests/vmx2xmldata/{vmx2xml-svga.vmx =3D> svga.vmx} | 0 tests/vmx2xmldata/{vmx2xml-svga.xml =3D> 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 =3D> ws-in-the-wild-1.vmx} | 0 .../{vmx2xml-ws-in-the-wild-1.xml =3D> ws-in-the-wild-1.xml} | 0 .../{vmx2xml-ws-in-the-wild-2.vmx =3D> ws-in-the-wild-2.vmx} | 0 .../{vmx2xml-ws-in-the-wild-2.xml =3D> ws-in-the-wild-2.xml} | 0 tests/vmx2xmltest.c | 4 ++-- 144 files changed, 6 insertions(+), 6 deletions(-) rename tests/vmx2xmldata/{vmx2xml-annotation.vmx =3D> annotation.vmx} (100= %) rename tests/vmx2xmldata/{vmx2xml-annotation.xml =3D> annotation.xml} (100= %) rename tests/vmx2xmldata/{vmx2xml-case-insensitive-1.vmx =3D> case-insensi= tive-1.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-case-insensitive-1.xml =3D> case-insensi= tive-1.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-case-insensitive-2.vmx =3D> case-insensi= tive-2.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-case-insensitive-2.xml =3D> case-insensi= tive-2.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-cdrom-ide-device.vmx =3D> cdrom-ide-devi= ce.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-cdrom-ide-device.xml =3D> cdrom-ide-devi= ce.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-cdrom-ide-empty-2.vmx =3D> cdrom-ide-emp= ty-2.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-cdrom-ide-empty-2.xml =3D> cdrom-ide-emp= ty-2.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-cdrom-ide-empty.vmx =3D> cdrom-ide-empty= .vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-cdrom-ide-empty.xml =3D> cdrom-ide-empty= .xml} (100%) rename tests/vmx2xmldata/{vmx2xml-cdrom-ide-file-missing-datastore.vmx =3D= > 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 =3D> cdr= om-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 =3D> cdrom-ide-file.v= mx} (100%) rename tests/vmx2xmldata/{vmx2xml-cdrom-ide-file.xml =3D> cdrom-ide-file.x= ml} (100%) rename tests/vmx2xmldata/{vmx2xml-cdrom-ide-raw-auto-detect.vmx =3D> cdrom= -ide-raw-auto-detect.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-cdrom-ide-raw-auto-detect.xml =3D> cdrom= -ide-raw-auto-detect.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-cdrom-ide-raw-device.vmx =3D> cdrom-ide-= raw-device.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-cdrom-ide-raw-device.xml =3D> cdrom-ide-= raw-device.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-cdrom-scsi-device.vmx =3D> cdrom-scsi-de= vice.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-cdrom-scsi-device.xml =3D> cdrom-scsi-de= vice.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-cdrom-scsi-empty.vmx =3D> cdrom-scsi-emp= ty.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-cdrom-scsi-empty.xml =3D> cdrom-scsi-emp= ty.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-cdrom-scsi-file.vmx =3D> cdrom-scsi-file= .vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-cdrom-scsi-file.xml =3D> cdrom-scsi-file= .xml} (100%) rename tests/vmx2xmldata/{vmx2xml-cdrom-scsi-passthru.vmx =3D> cdrom-scsi-= passthru.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-cdrom-scsi-passthru.xml =3D> cdrom-scsi-= passthru.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-cdrom-scsi-raw-auto-detect.vmx =3D> cdro= m-scsi-raw-auto-detect.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-cdrom-scsi-raw-auto-detect.xml =3D> cdro= m-scsi-raw-auto-detect.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-cdrom-scsi-raw-device.vmx =3D> cdrom-scs= i-raw-device.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-cdrom-scsi-raw-device.xml =3D> cdrom-scs= i-raw-device.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-datacenterpath.vmx =3D> datacenterpath.v= mx} (100%) rename tests/vmx2xmldata/{vmx2xml-datacenterpath.xml =3D> datacenterpath.x= ml} (100%) rename tests/vmx2xmldata/{vmx2xml-esx-in-the-wild-1.vmx =3D> esx-in-the-wi= ld-1.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-esx-in-the-wild-1.xml =3D> esx-in-the-wi= ld-1.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-esx-in-the-wild-10.vmx =3D> esx-in-the-w= ild-10.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-esx-in-the-wild-10.xml =3D> esx-in-the-w= ild-10.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-esx-in-the-wild-11.vmx =3D> esx-in-the-w= ild-11.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-esx-in-the-wild-11.xml =3D> esx-in-the-w= ild-11.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-esx-in-the-wild-2.vmx =3D> esx-in-the-wi= ld-2.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-esx-in-the-wild-2.xml =3D> esx-in-the-wi= ld-2.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-esx-in-the-wild-3.vmx =3D> esx-in-the-wi= ld-3.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-esx-in-the-wild-3.xml =3D> esx-in-the-wi= ld-3.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-esx-in-the-wild-4.vmx =3D> esx-in-the-wi= ld-4.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-esx-in-the-wild-4.xml =3D> esx-in-the-wi= ld-4.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-esx-in-the-wild-5.vmx =3D> esx-in-the-wi= ld-5.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-esx-in-the-wild-5.xml =3D> esx-in-the-wi= ld-5.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-esx-in-the-wild-6.vmx =3D> esx-in-the-wi= ld-6.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-esx-in-the-wild-6.xml =3D> esx-in-the-wi= ld-6.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-esx-in-the-wild-7.vmx =3D> esx-in-the-wi= ld-7.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-esx-in-the-wild-7.xml =3D> esx-in-the-wi= ld-7.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-esx-in-the-wild-8.vmx =3D> esx-in-the-wi= ld-8.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-esx-in-the-wild-8.xml =3D> esx-in-the-wi= ld-8.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-esx-in-the-wild-9.vmx =3D> esx-in-the-wi= ld-9.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-esx-in-the-wild-9.xml =3D> esx-in-the-wi= ld-9.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-ethernet-bridged.vmx =3D> ethernet-bridg= ed.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-ethernet-bridged.xml =3D> ethernet-bridg= ed.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-ethernet-custom.vmx =3D> ethernet-custom= .vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-ethernet-custom.xml =3D> ethernet-custom= .xml} (100%) rename tests/vmx2xmldata/{vmx2xml-ethernet-e1000.vmx =3D> ethernet-e1000.v= mx} (100%) rename tests/vmx2xmldata/{vmx2xml-ethernet-e1000.xml =3D> ethernet-e1000.x= ml} (100%) rename tests/vmx2xmldata/{vmx2xml-ethernet-generated.vmx =3D> ethernet-gen= erated.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-ethernet-generated.xml =3D> ethernet-gen= erated.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-ethernet-nat.vmx =3D> ethernet-nat.vmx} = (100%) rename tests/vmx2xmldata/{vmx2xml-ethernet-nat.xml =3D> ethernet-nat.xml} = (100%) rename tests/vmx2xmldata/{vmx2xml-ethernet-other.vmx =3D> ethernet-other.v= mx} (100%) rename tests/vmx2xmldata/{vmx2xml-ethernet-other.xml =3D> ethernet-other.x= ml} (100%) rename tests/vmx2xmldata/{vmx2xml-ethernet-static.vmx =3D> ethernet-static= .vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-ethernet-static.xml =3D> ethernet-static= .xml} (100%) rename tests/vmx2xmldata/{vmx2xml-ethernet-vmxnet2.vmx =3D> ethernet-vmxne= t2.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-ethernet-vmxnet2.xml =3D> ethernet-vmxne= t2.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-ethernet-vpx.vmx =3D> ethernet-vpx.vmx} = (100%) rename tests/vmx2xmldata/{vmx2xml-ethernet-vpx.xml =3D> ethernet-vpx.xml} = (100%) rename tests/vmx2xmldata/{vmx2xml-firmware-efi.vmx =3D> firmware-efi.vmx} = (100%) rename tests/vmx2xmldata/{vmx2xml-firmware-efi.xml =3D> firmware-efi.xml} = (100%) rename tests/vmx2xmldata/{vmx2xml-floppy-device.vmx =3D> floppy-device.vmx= } (100%) rename tests/vmx2xmldata/{vmx2xml-floppy-device.xml =3D> floppy-device.xml= } (100%) rename tests/vmx2xmldata/{vmx2xml-floppy-file.vmx =3D> floppy-file.vmx} (1= 00%) rename tests/vmx2xmldata/{vmx2xml-floppy-file.xml =3D> floppy-file.xml} (1= 00%) rename tests/vmx2xmldata/{vmx2xml-fusion-in-the-wild-1.vmx =3D> fusion-in-= the-wild-1.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-fusion-in-the-wild-1.xml =3D> fusion-in-= the-wild-1.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-graphics-vnc.vmx =3D> graphics-vnc.vmx} = (100%) rename tests/vmx2xmldata/{vmx2xml-graphics-vnc.xml =3D> graphics-vnc.xml} = (100%) rename tests/vmx2xmldata/{vmx2xml-gsx-in-the-wild-1.vmx =3D> gsx-in-the-wi= ld-1.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-gsx-in-the-wild-1.xml =3D> gsx-in-the-wi= ld-1.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-gsx-in-the-wild-2.vmx =3D> gsx-in-the-wi= ld-2.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-gsx-in-the-wild-2.xml =3D> gsx-in-the-wi= ld-2.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-gsx-in-the-wild-3.vmx =3D> gsx-in-the-wi= ld-3.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-gsx-in-the-wild-3.xml =3D> gsx-in-the-wi= ld-3.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-gsx-in-the-wild-4.vmx =3D> gsx-in-the-wi= ld-4.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-gsx-in-the-wild-4.xml =3D> gsx-in-the-wi= ld-4.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-harddisk-ide-file-missing-datastore.vmx = =3D> harddisk-ide-file-missing-datastore.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-harddisk-ide-file.vmx =3D> harddisk-ide-= file.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-harddisk-ide-file.xml =3D> harddisk-ide-= file.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-harddisk-scsi-file-missing-file.vmx =3D>= harddisk-scsi-file-missing-file.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-harddisk-scsi-file.vmx =3D> harddisk-scs= i-file.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-harddisk-scsi-file.xml =3D> harddisk-scs= i-file.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-harddisk-transient.vmx =3D> harddisk-tra= nsient.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-harddisk-transient.xml =3D> harddisk-tra= nsient.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-minimal-64bit.vmx =3D> minimal-64bit.vmx= } (100%) rename tests/vmx2xmldata/{vmx2xml-minimal-64bit.xml =3D> minimal-64bit.xml= } (100%) rename tests/vmx2xmldata/{vmx2xml-minimal.vmx =3D> minimal.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-minimal.xml =3D> minimal.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-parallel-device.vmx =3D> parallel-device= .vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-parallel-device.xml =3D> parallel-device= .xml} (100%) rename tests/vmx2xmldata/{vmx2xml-parallel-file.vmx =3D> parallel-file.vmx= } (100%) rename tests/vmx2xmldata/{vmx2xml-parallel-file.xml =3D> parallel-file.xml= } (100%) rename tests/vmx2xmldata/{vmx2xml-scsi-driver.vmx =3D> scsi-driver.vmx} (1= 00%) rename tests/vmx2xmldata/{vmx2xml-scsi-driver.xml =3D> scsi-driver.xml} (1= 00%) rename tests/vmx2xmldata/{vmx2xml-scsi-writethrough.vmx =3D> scsi-writethr= ough.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-scsi-writethrough.xml =3D> scsi-writethr= ough.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-serial-device.vmx =3D> serial-device.vmx= } (100%) rename tests/vmx2xmldata/{vmx2xml-serial-device.xml =3D> serial-device.xml= } (100%) rename tests/vmx2xmldata/{vmx2xml-serial-file.vmx =3D> serial-file.vmx} (1= 00%) rename tests/vmx2xmldata/{vmx2xml-serial-file.xml =3D> serial-file.xml} (1= 00%) rename tests/vmx2xmldata/{vmx2xml-serial-network-client.vmx =3D> serial-ne= twork-client.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-serial-network-client.xml =3D> serial-ne= twork-client.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-serial-network-server.vmx =3D> serial-ne= twork-server.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-serial-network-server.xml =3D> serial-ne= twork-server.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-serial-pipe-client-app.vmx =3D> serial-p= ipe-client-app.vmx} (100%) create mode 120000 tests/vmx2xmldata/serial-pipe-client-app.xml rename tests/vmx2xmldata/{vmx2xml-serial-pipe-client-vm.vmx =3D> serial-pi= pe-client-vm.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-serial-pipe-server-app.vmx =3D> serial-p= ipe-server-app.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-serial-pipe-server-vm.vmx =3D> serial-pi= pe-server-vm.vmx} (100%) create mode 120000 tests/vmx2xmldata/serial-pipe-server-vm.xml rename tests/vmx2xmldata/{vmx2xml-serial-pipe.xml =3D> serial-pipe.xml} (1= 00%) rename tests/vmx2xmldata/{vmx2xml-sharedfolder.vmx =3D> sharedfolder.vmx} = (100%) rename tests/vmx2xmldata/{vmx2xml-sharedfolder.xml =3D> sharedfolder.xml} = (100%) rename tests/vmx2xmldata/{vmx2xml-smbios.vmx =3D> smbios.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-smbios.xml =3D> smbios.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-svga.vmx =3D> svga.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-svga.xml =3D> svga.xml} (100%) delete mode 120000 tests/vmx2xmldata/vmx2xml-cdrom-ide-file-missing-datast= ore.xml delete mode 120000 tests/vmx2xmldata/vmx2xml-cdrom-ide-file-missing-file.x= ml 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 =3D> ws-in-the-wild= -1.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-ws-in-the-wild-1.xml =3D> ws-in-the-wild= -1.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-ws-in-the-wild-2.vmx =3D> ws-in-the-wild= -2.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-ws-in-the-wild-2.xml =3D> ws-in-the-wild= -2.xml} (100%) diff --git a/tests/vmx2xmldata/vmx2xml-annotation.vmx b/tests/vmx2xmldata/a= nnotation.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/a= nnotation.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/vmx2x= mldata/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/vmx2x= mldata/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/vmx2x= mldata/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/vmx2x= mldata/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/vmx2xml= data/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/vmx2xml= data/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/vmx2xm= ldata/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/vmx2xm= ldata/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/vmx2xmld= ata/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/vmx2xmld= ata/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/te= sts/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/vmx2= xmldata/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/vmx2xmlda= ta/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/vmx2xmlda= ta/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/test= s/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/test= s/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/vmx= 2xmldata/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/vmx= 2xmldata/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/vmx2xm= ldata/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/vmx2xm= ldata/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/vmx2xml= data/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/vmx2xml= data/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/vmx2xmld= ata/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/vmx2xmld= ata/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/vmx2= xmldata/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/vmx2= xmldata/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/tes= ts/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/tes= ts/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/vm= x2xmldata/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/vm= x2xmldata/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/vmx2xmlda= ta/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/vmx2xmlda= ta/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/vmx2xm= ldata/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/vmx2xm= ldata/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/vmx2x= mldata/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/vmx2x= mldata/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/vmx2x= mldata/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/vmx2x= mldata/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/vmx2xm= ldata/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/vmx2xm= ldata/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/vmx2xm= ldata/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/vmx2xm= ldata/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/vmx2xm= ldata/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/vmx2xm= ldata/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/vmx2xm= ldata/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/vmx2xm= ldata/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/vmx2xm= ldata/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/vmx2xm= ldata/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/vmx2xm= ldata/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/vmx2xm= ldata/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/vmx2xm= ldata/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/vmx2xm= ldata/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/vmx2xm= ldata/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/vmx2xm= ldata/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/vmx2xml= data/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/vmx2xml= data/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/vmx2xmld= ata/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/vmx2xmld= ata/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/vmx2xmlda= ta/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/vmx2xmlda= ta/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/vmx2x= mldata/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/vmx2x= mldata/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/vmx2xmlda= ta/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/vmx2xmlda= ta/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/vmx2xmld= ata/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/vmx2xmld= ata/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/vmx2xml= data/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/vmx2xml= data/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/vmx2xmldat= a/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/vmx2xmldat= a/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/vmx= 2xmldata/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/vmx= 2xmldata/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/vmx2xm= ldata/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/vmx2xm= ldata/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/vmx2xm= ldata/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/vmx2xm= ldata/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/vmx2xm= ldata/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/vmx2xm= ldata/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/vmx2xm= ldata/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/vmx2xm= ldata/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.v= mx rename to tests/vmx2xmldata/harddisk-ide-file-missing-datastore.vmx diff --git a/tests/vmx2xmldata/vmx2xml-harddisk-ide-file.vmx b/tests/vmx2xm= ldata/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/vmx2xm= ldata/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/vmx2x= mldata/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/vmx2x= mldata/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/vmx2x= mldata/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/vmx2x= mldata/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/vmx2xmldat= a/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/vmx2xmldat= a/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/mini= mal.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/mini= mal.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/vmx2xmld= ata/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/vmx2xmld= ata/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/vmx2xmldat= a/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/vmx2xmldat= a/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/vmx2xm= ldata/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/vmx2xm= ldata/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/vmx2xmldat= a/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/vmx2xmldat= a/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/vm= x2xmldata/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/vm= x2xmldata/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/vm= x2xmldata/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/vm= x2xmldata/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/v= mx2xmldata/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/vmx2xmlda= ta/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/vm= x2xmldata/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/v= mx2xmldata/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/vm= x2xmldata/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/vmx2xmldat= a/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/smbio= s.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/smbio= s.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/te= sts/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/v= mx2xmldata/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/vm= x2xmldata/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/vmx2xml= data/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/vmx2xml= data/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/vmx2xml= data/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/vmx2xml= data/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 =3D NULL; char *xml =3D NULL; =20 - vmx =3D g_strdup_printf("%s/vmx2xmldata/vmx2xml-%s.vmx", abs_srcdir, + vmx =3D g_strdup_printf("%s/vmx2xmldata/%s.vmx", abs_srcdir, info->file); - xml =3D g_strdup_printf("%s/vmx2xmldata/vmx2xml-%s.xml", abs_srcdir, + xml =3D g_strdup_printf("%s/vmx2xmldata/%s.xml", abs_srcdir, info->file); =20 ret =3D testCompareFiles(vmx, xml, info->should_fail); --=20 2.31.1