Changeset 58982 in vbox for trunk/src/VBox/ValidationKit/testdriver/vboxtestvms.py

Timestamp:

Dec 4, 2015 12:55:18 PM (9 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

104506

Message:

Added BIOS/EFI swithing code and EFI smoke tests.

File:

• trunk/src/VBox/ValidationKit/testdriver/vboxtestvms.py (modified) (5 diffs)

trunk/src/VBox/ValidationKit/testdriver/vboxtestvms.py

@@ -178 +178 @@
                  fIoApic = None, fPae = None, sNic0AttachType = None, sHddControllerType = 'IDE Controller',
                  sFloppy = None, fVmmDevTestingPart = None, fVmmDevTestingMmio = False, asParavirtModesSup = None,
-                 fRandomPvPMode = False):
+                 fRandomPvPMode = False, sFirmwareType = 'bios'):
         self.oSet                    = oSet;
         self.sVmName                 = sVmName;
@@ -195 +195 @@
         self.fVmmDevTestingPart      = fVmmDevTestingPart;
         self.fVmmDevTestingMmio      = fVmmDevTestingMmio;
+        self.sFirmwareType           = sFirmwareType;
 
         self.fSnapshotRestoreCurrent = False;        # Whether to restore execution on the current snapshot.
@@ -660 +661 @@
                                             sFloppy            = oTestVm.sFloppy,
                                             fVmmDevTestingPart = oTestVm.fVmmDevTestingPart,
-                                            fVmmDevTestingMmio = oTestVm.fVmmDevTestingPart);
+                                            fVmmDevTestingMmio = oTestVm.fVmmDevTestingPart,
+                                            sFirmwareType = oTestVm.sFirmwareType);
             if oVM is None:
                 return False;
@@ -824 +826 @@
         oSet = TestVmSet(oTestVmManager = self);
 
+        oTestVm = TestVm(oSet, 'tst-win10-efi', sHd = '4.2/efi/win10-efi-x86.vdi',
+                         sKind = 'Windows10', acCpusSup = range(1, 33), fIoApic = True, sFirmwareType = 'efi');
+        oSet.aoTestVms.append(oTestVm);
+
+        oTestVm = TestVm(oSet, 'tst-win10-64-efi', sHd = '4.2/efi/win10-efi-amd64.vdi',
+                         sKind = 'Windows10_64', acCpusSup = range(1, 33), fIoApic = True, sFirmwareType = 'efi');
+        oSet.aoTestVms.append(oTestVm);
+
         oTestVm = TestVm(oSet, 'tst-nt4sp1', sHd = '4.2/' + sTxsTransport + '/nt4sp1/t-nt4sp1.vdi',
                          sKind = 'WindowsNT4', acCpusSup = [1]);
@@ -880 +890 @@
 
         oSet = TestVmSet(oTestVmManager = self);
+
+        oTestVm = TestVm(oSet, 'tst-win10-efi', sHd = '4.2/efi/win10-efi-x86.vdi',
+                         sKind = 'Windows10', acCpusSup = range(1, 33), fIoApic = True, sFirmwareType = 'efi');
+        oSet.aoTestVms.append(oTestVm);
+
+        oTestVm = TestVm(oSet, 'tst-win10-64-efi', sHd = '4.2/efi/win10-efi-amd64.vdi',
+                         sKind = 'Windows10_64', acCpusSup = range(1, 33), fIoApic = True, sFirmwareType = 'efi');
+        oSet.aoTestVms.append(oTestVm);
 
         oTestVm = TestVm(oSet, 'tst-nt4sp1', sHd = '4.2/nat/nt4sp1/t-nt4sp1.vdi',