This commit adds test case data for the Windows 7 ISOs I have
available locally and updates the windows 7 volume ID list
so that make check still passes after these additions.
---
data/oses/windows.xml | 5 ++--
...rofessional_n_with_sp1_x86_dvd_u_677328.iso.txt | 29 ++++++++++++++++++++
...ome_premium_n_with_sp1_x64_dvd_u_676833.iso.txt | 29 ++++++++++++++++++++
..._7_enterprise_with_sp1_x64_dvd_u_677671.iso.txt | 29 ++++++++++++++++++++
...ws_7_ultimate_with_sp1_x86_dvd_u_677463.iso.txt | 29 ++++++++++++++++++++
5 files changed, 119 insertions(+), 2 deletions(-)
create mode 100644 test/isodata/windows/win7/en_windows_7_professional_n_with_sp1_x86_dvd_u_677328.iso.txt
create mode 100644 test/isodata/windows/win7/fr_windows_7_home_premium_n_with_sp1_x64_dvd_u_676833.iso.txt
create mode 100644 test/isodata/windows/win7/ru_windows_7_enterprise_with_sp1_x64_dvd_u_677671.iso.txt
create mode 100644 test/isodata/windows/win7/ru_windows_7_ultimate_with_sp1_x86_dvd_u_677463.iso.txt
diff --git a/data/oses/windows.xml b/data/oses/windows.xml
index 308ab86..0ec0eff 100644
--- a/data/oses/windows.xml
+++ b/data/oses/windows.xml
@@ -633,13 +633,14 @@
<media arch="i386">
<iso>
- <volume-id>(GRMCULFRER|GSP1RMCPRFRER|GRMCENVOL|GRMCNENVOL|GRMCPRFRER)_</volume-id>
+ <volume-id>(GRMCULFRER|GSP1RMCNPRFRER|GSP1RMCULFRER|GSP1RMCPRFRER|GRMCENVOL|GRMCNENVOL|GRMCPRFRER)_</volume-id>
<publisher-id>MICROSOFT CORPORATION</publisher-id>
+
</iso>
</media>
<media arch="x86_64">
<iso>
- <volume-id>(GRMCULXFRER|GSP1RMCPRXFRER|GRMCENXVOL|GRMCNENXVOL|GRMCPRXFRER)_</volume-id>
+ <volume-id>(GRMCULXFRER|GSP1RMCPRXFRER|GSP1RMCNHPXFRER|GSP1RMCENXVOL|GRMCENXVOL|GRMCNENXVOL|GRMCPRXFRER)_</volume-id>
<publisher-id>MICROSOFT CORPORATION</publisher-id>
</iso>
</media>
diff --git a/test/isodata/windows/win7/en_windows_7_professional_n_with_sp1_x86_dvd_u_677328.iso.txt b/test/isodata/windows/win7/en_windows_7_professional_n_with_sp1_x86_dvd_u_677328.iso.txt
new file mode 100644
index 0000000..ce9100f
--- /dev/null
+++ b/test/isodata/windows/win7/en_windows_7_professional_n_with_sp1_x86_dvd_u_677328.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id:
+Volume id: GSP1RMCNPRFRER_EN_DVD
+Volume set id: GSP1RMCNPRFRER_EN_DVD
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.54 (01/01/2005 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: 1108598
+El Torito VD version 1 found, boot catalog is in sector 22
+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 8
+ Bootoff 2DF 735
diff --git a/test/isodata/windows/win7/fr_windows_7_home_premium_n_with_sp1_x64_dvd_u_676833.iso.txt b/test/isodata/windows/win7/fr_windows_7_home_premium_n_with_sp1_x64_dvd_u_676833.iso.txt
new file mode 100644
index 0000000..0ec47c2
--- /dev/null
+++ b/test/isodata/windows/win7/fr_windows_7_home_premium_n_with_sp1_x64_dvd_u_676833.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id:
+Volume id: GSP1RMCNHPXFRER_FR_DVD
+Volume set id: GSP1RMCNHPXFRER_FR_DVD
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.54 (01/01/2005 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: 1418569
+El Torito VD version 1 found, boot catalog is in sector 22
+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 8
+ Bootoff 2DE 734
diff --git a/test/isodata/windows/win7/ru_windows_7_enterprise_with_sp1_x64_dvd_u_677671.iso.txt b/test/isodata/windows/win7/ru_windows_7_enterprise_with_sp1_x64_dvd_u_677671.iso.txt
new file mode 100644
index 0000000..ef15f99
--- /dev/null
+++ b/test/isodata/windows/win7/ru_windows_7_enterprise_with_sp1_x64_dvd_u_677671.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id:
+Volume id: GSP1RMCENXVOL_RU_DVD
+Volume set id: GSP1RMCENXVOL_RU_DVD
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.54 (01/01/2005 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: 1501031
+El Torito VD version 1 found, boot catalog is in sector 22
+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 8
+ Bootoff 2DE 734
diff --git a/test/isodata/windows/win7/ru_windows_7_ultimate_with_sp1_x86_dvd_u_677463.iso.txt b/test/isodata/windows/win7/ru_windows_7_ultimate_with_sp1_x86_dvd_u_677463.iso.txt
new file mode 100644
index 0000000..f817b0d
--- /dev/null
+++ b/test/isodata/windows/win7/ru_windows_7_ultimate_with_sp1_x86_dvd_u_677463.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id:
+Volume id: GSP1RMCULFRER_RU_DVD
+Volume set id: GSP1RMCULFRER_RU_DVD
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.54 (01/01/2005 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: 1207023
+El Torito VD version 1 found, boot catalog is in sector 22
+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 8
+ Bootoff 2DF 735
--
1.7.10.2
