[virt-tools-list] [PATCH 2/3] Add more Windows XP test cases and a new volume ID

[Christophe Fergeau]

Add the output of isoinfo -d -i image.iso for the Windows XP I
have available locally, this makes make check a bit more extensive.
Since make check was failing after these additions, this commit
also adds the missing volume ID for Windows XP 64 bit with debugging
enabled to windows.xml
---
 data/oses/windows.xml                              |    2 +-
 ..._n_with_service_pack_3_x86_cd_x14-92445.iso.txt |   29 ++++++++++++++++++++
 .../en_windows_xp_professional_x64_chk.iso.txt     |   29 ++++++++++++++++++++
 ...me_with_service_pack_3_x86_cd_x14-92426.iso.txt |   29 ++++++++++++++++++++
 4 files changed, 88 insertions(+), 1 deletion(-)
 create mode 100644 test/isodata/windows/winxp/en_windows_xp_professional_n_with_service_pack_3_x86_cd_x14-92445.iso.txt
 create mode 100644 test/isodata/windows/winxp/en_windows_xp_professional_x64_chk.iso.txt
 create mode 100644 test/isodata/windows/winxp/ru_windows_xp_home_with_service_pack_3_x86_cd_x14-92426.iso.txt

diff --git a/data/oses/windows.xml b/data/oses/windows.xml
index 13cb97e..308ab86 100644
--- a/data/oses/windows.xml
+++ b/data/oses/windows.xml
@@ -332,7 +332,7 @@
 
     <media arch="x86_64">
       <iso>
-        <volume-id>(ARMPXFPP|ARMPXCCP|ARMPXOEM|ARMPXVOL|AX2PXFPP)_</volume-id>
+        <volume-id>(ARMPXFPP|ARMPXCCP|ARMPXOEM|ARMPXVOL|AX2PXCFPP|AX2PXFPP)_</volume-id>
         <publisher-id>MICROSOFT CORPORATION</publisher-id>
       </iso>
     </media>
diff --git a/test/isodata/windows/winxp/en_windows_xp_professional_n_with_service_pack_3_x86_cd_x14-92445.iso.txt b/test/isodata/windows/winxp/en_windows_xp_professional_n_with_service_pack_3_x86_cd_x14-92445.iso.txt
new file mode 100644
index 0000000..a4b06bf
--- /dev/null
+++ b/test/isodata/windows/winxp/en_windows_xp_professional_n_with_service_pack_3_x86_cd_x14-92445.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: 
+Volume id: GRTMPRMFPP_EN
+Volume set id: GRTMPRMFPP_EN
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.52 (03/09/2004 TM)
+Copyright File id: 
+Abstract File id: 
+Bibliographic File id: 
+Volume set size is: 1
+Volume set sequence number is: 1
+Logical block size is: 2048
+Volume size is: 306092
+El Torito VD version 1 found, boot catalog is in sector 19
+NO Joliet present
+NO Rock Ridge present
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID 'Microsoft Corporation'
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 4
+        Bootoff 15C 348
diff --git a/test/isodata/windows/winxp/en_windows_xp_professional_x64_chk.iso.txt b/test/isodata/windows/winxp/en_windows_xp_professional_x64_chk.iso.txt
new file mode 100644
index 0000000..dd9d8a2
--- /dev/null
+++ b/test/isodata/windows/winxp/en_windows_xp_professional_x64_chk.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: 
+Volume id: AX2PXCFPP_EN
+Volume set id: AX2PXCFPP_EN
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.52 (03/09/2004 TM)
+Copyright File id: 
+Abstract File id: 
+Bibliographic File id: 
+Volume set size is: 1
+Volume set sequence number is: 1
+Logical block size is: 2048
+Volume size is: 321301
+El Torito VD version 1 found, boot catalog is in sector 19
+NO Joliet present
+NO Rock Ridge present
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID 'Microsoft Corporation'
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 4
+        Bootoff E8 232
diff --git a/test/isodata/windows/winxp/ru_windows_xp_home_with_service_pack_3_x86_cd_x14-92426.iso.txt b/test/isodata/windows/winxp/ru_windows_xp_home_with_service_pack_3_x86_cd_x14-92426.iso.txt
new file mode 100644
index 0000000..cde9552
--- /dev/null
+++ b/test/isodata/windows/winxp/ru_windows_xp_home_with_service_pack_3_x86_cd_x14-92426.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: 
+Volume id: GRTMHFPP_RU
+Volume set id: GRTMHFPP_RU
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.52 (03/09/2004 TM)
+Copyright File id: 
+Abstract File id: 
+Bibliographic File id: 
+Volume set size is: 1
+Volume set sequence number is: 1
+Logical block size is: 2048
+Volume size is: 294726
+El Torito VD version 1 found, boot catalog is in sector 19
+NO Joliet present
+NO Rock Ridge present
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID 'Microsoft Corporation'
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 4
+        Bootoff 13E 318
-- 
1.7.10.2