ia64/xen-unstable

changeset 8360:30f54abf9592

Adding SKIP() to tests that aren't supported for VMX domains.

Signed-off-by: Dan Stekloff <dsteklof@us.ibm.com>
author stekloff@elm3b216.beaverton.ibm.com
date Wed Dec 14 11:59:19 2005 +0000 (2005-12-14)
parents a55d4a167203
children 52916bfbfa35
files tools/xm-test/tests/block-create/01_block_attach_device_pos.py tools/xm-test/tests/block-create/02_block_attach_file_device_pos.py tools/xm-test/tests/block-create/04_block_attach_device_repeatedly_pos.py tools/xm-test/tests/block-create/05_block_attach_and_dettach_device_repeatedly_pos.py tools/xm-test/tests/block-create/06_block_attach_baddomain_neg.py tools/xm-test/tests/block-create/07_block_attach_baddevice_neg.py tools/xm-test/tests/block-create/08_block_attach_bad_filedevice_neg.py tools/xm-test/tests/block-create/09_block_attach_and_dettach_device_check_data_pos.py tools/xm-test/tests/block-create/10_block_attach_dettach_multiple_devices.py tools/xm-test/tests/block-create/11_block_attach_shared_dom0.py tools/xm-test/tests/block-create/12_block_attach_shared_domU.py tools/xm-test/tests/block-destroy/01_block-destroy_btblock_pos.py tools/xm-test/tests/block-destroy/02_block-destroy_rtblock_pos.py tools/xm-test/tests/block-destroy/04_block-destroy_nonattached_neg.py tools/xm-test/tests/block-destroy/05_block-destroy_byname_pos.py tools/xm-test/tests/block-destroy/06_block-destroy_check_list_pos.py tools/xm-test/tests/block-list/01_block-list_pos.py tools/xm-test/tests/block-list/02_block-list_attachbd_pos.py tools/xm-test/tests/block-list/03_block-list_anotherbd_pos.py tools/xm-test/tests/block-list/04_block-list_nodb_pos.py tools/xm-test/tests/block-list/06_block-list_checkremove_pos.py tools/xm-test/tests/memmax/01_memmax_badparm_neg.py tools/xm-test/tests/memset/01_memset_basic_pos.py tools/xm-test/tests/memset/02_memset_badparm_neg.py tools/xm-test/tests/memset/03_memset_random_pos.py tools/xm-test/tests/memset/04_memset_smallmem_pos.py tools/xm-test/tests/migrate/01_migrate_localhost_pos.py tools/xm-test/tests/network-attach/01_network_attach_pos.py tools/xm-test/tests/network-attach/02_network_attach_detach_pos.py tools/xm-test/tests/network-attach/03_network_attach_detach_multiple_pos.py tools/xm-test/tests/restore/01_restore_basic_pos.py tools/xm-test/tests/restore/02_restore_badparm_neg.py tools/xm-test/tests/restore/03_restore_badfilename_neg.py tools/xm-test/tests/restore/04_restore_withdevices_pos.py tools/xm-test/tests/save/01_save_basic_pos.py tools/xm-test/tests/save/02_save_badparm_neg.py tools/xm-test/tests/save/03_save_bogusfile_neg.py tools/xm-test/tests/sysrq/01_sysrq_basic_neg.py tools/xm-test/tests/sysrq/02_sysrq_sync_pos.py tools/xm-test/tests/sysrq/03_sysrq_withreboot_pos.py
line diff
     1.1 --- a/tools/xm-test/tests/block-create/01_block_attach_device_pos.py	Wed Dec 14 11:56:25 2005 +0000
     1.2 +++ b/tools/xm-test/tests/block-create/01_block_attach_device_pos.py	Wed Dec 14 11:59:19 2005 +0000
     1.3 @@ -9,6 +9,8 @@ import time
     1.4  
     1.5  from XmTestLib import *
     1.6  
     1.7 +if ENABLE_VMX_SUPPORT:
     1.8 +    SKIP("Block-attach not supported for VMX domains")
     1.9  
    1.10  # Create a domain (default XmTestDomain, with our ramdisk)
    1.11  domain = XmTestDomain()
     2.1 --- a/tools/xm-test/tests/block-create/02_block_attach_file_device_pos.py	Wed Dec 14 11:56:25 2005 +0000
     2.2 +++ b/tools/xm-test/tests/block-create/02_block_attach_file_device_pos.py	Wed Dec 14 11:59:19 2005 +0000
     2.3 @@ -9,6 +9,8 @@ import time
     2.4  
     2.5  from XmTestLib import *
     2.6  
     2.7 +if ENABLE_VMX_SUPPORT:
     2.8 +    SKIP("Block-attach not supported for VMX domains")
     2.9  
    2.10  # Create a domain (default XmTestDomain, with our ramdisk)
    2.11  domain = XmTestDomain()
     3.1 --- a/tools/xm-test/tests/block-create/04_block_attach_device_repeatedly_pos.py	Wed Dec 14 11:56:25 2005 +0000
     3.2 +++ b/tools/xm-test/tests/block-create/04_block_attach_device_repeatedly_pos.py	Wed Dec 14 11:59:19 2005 +0000
     3.3 @@ -9,6 +9,8 @@ import time
     3.4  
     3.5  from XmTestLib import *
     3.6  
     3.7 +if ENABLE_VMX_SUPPORT:
     3.8 +    SKIP("Block-attach not supported for VMX domains")
     3.9  
    3.10  # Create a domain (default XmTestDomain, with our ramdisk)
    3.11  domain = XmTestDomain()
     4.1 --- a/tools/xm-test/tests/block-create/05_block_attach_and_dettach_device_repeatedly_pos.py	Wed Dec 14 11:56:25 2005 +0000
     4.2 +++ b/tools/xm-test/tests/block-create/05_block_attach_and_dettach_device_repeatedly_pos.py	Wed Dec 14 11:59:19 2005 +0000
     4.3 @@ -9,6 +9,8 @@ import time
     4.4  
     4.5  from XmTestLib import *
     4.6  
     4.7 +if ENABLE_VMX_SUPPORT:
     4.8 +    SKIP("Block-attach not supported for VMX domains")
     4.9  
    4.10  # Create a domain (default XmTestDomain, with our ramdisk)
    4.11  domain = XmTestDomain()
     5.1 --- a/tools/xm-test/tests/block-create/06_block_attach_baddomain_neg.py	Wed Dec 14 11:56:25 2005 +0000
     5.2 +++ b/tools/xm-test/tests/block-create/06_block_attach_baddomain_neg.py	Wed Dec 14 11:59:19 2005 +0000
     5.3 @@ -5,6 +5,9 @@
     5.4  
     5.5  from XmTestLib import *
     5.6  
     5.7 +if ENABLE_VMX_SUPPORT:
     5.8 +    SKIP("Block-attach not supported for VMX domains")
     5.9 +
    5.10  status, output = traceCommand("xm block-attach NOT-EXIST phy:ram1 sdb1 w")
    5.11  
    5.12  eyecatcher = "Error"
     6.1 --- a/tools/xm-test/tests/block-create/07_block_attach_baddevice_neg.py	Wed Dec 14 11:56:25 2005 +0000
     6.2 +++ b/tools/xm-test/tests/block-create/07_block_attach_baddevice_neg.py	Wed Dec 14 11:59:19 2005 +0000
     6.3 @@ -9,6 +9,8 @@ import time
     6.4  
     6.5  from XmTestLib import *
     6.6  
     6.7 +if ENABLE_VMX_SUPPORT:
     6.8 +    SKIP("Block-attach not supported for VMX domains")
     6.9  
    6.10  # Create a domain (default XmTestDomain, with our ramdisk)
    6.11  domain = XmTestDomain()
     7.1 --- a/tools/xm-test/tests/block-create/08_block_attach_bad_filedevice_neg.py	Wed Dec 14 11:56:25 2005 +0000
     7.2 +++ b/tools/xm-test/tests/block-create/08_block_attach_bad_filedevice_neg.py	Wed Dec 14 11:59:19 2005 +0000
     7.3 @@ -9,6 +9,8 @@ import time
     7.4  
     7.5  from XmTestLib import *
     7.6  
     7.7 +if ENABLE_VMX_SUPPORT:
     7.8 +    SKIP("Block-attach not supported for VMX domains")
     7.9  
    7.10  # Create a domain (default XmTestDomain, with our ramdisk)
    7.11  domain = XmTestDomain()
     8.1 --- a/tools/xm-test/tests/block-create/09_block_attach_and_dettach_device_check_data_pos.py	Wed Dec 14 11:56:25 2005 +0000
     8.2 +++ b/tools/xm-test/tests/block-create/09_block_attach_and_dettach_device_check_data_pos.py	Wed Dec 14 11:59:19 2005 +0000
     8.3 @@ -9,6 +9,8 @@ import time
     8.4  
     8.5  from XmTestLib import *
     8.6  
     8.7 +if ENABLE_VMX_SUPPORT:
     8.8 +    SKIP("Block-attach not supported for VMX domains")
     8.9  
    8.10  # Create a domain (default XmTestDomain, with our ramdisk)
    8.11  domain = XmTestDomain()
     9.1 --- a/tools/xm-test/tests/block-create/10_block_attach_dettach_multiple_devices.py	Wed Dec 14 11:56:25 2005 +0000
     9.2 +++ b/tools/xm-test/tests/block-create/10_block_attach_dettach_multiple_devices.py	Wed Dec 14 11:59:19 2005 +0000
     9.3 @@ -46,6 +46,9 @@ def dettach(devname):
     9.4  
     9.5      return 0, None
     9.6  	
     9.7 +if ENABLE_VMX_SUPPORT:
     9.8 +    SKIP("Block-attach not supported for VMX domains")
     9.9 +
    9.10  # Create a domain (default XmTestDomain, with our ramdisk)
    9.11  domain = XmTestDomain()
    9.12  
    10.1 --- a/tools/xm-test/tests/block-create/11_block_attach_shared_dom0.py	Wed Dec 14 11:56:25 2005 +0000
    10.2 +++ b/tools/xm-test/tests/block-create/11_block_attach_shared_dom0.py	Wed Dec 14 11:59:19 2005 +0000
    10.3 @@ -5,6 +5,9 @@
    10.4  
    10.5  from XmTestLib import *
    10.6  
    10.7 +if ENABLE_VMX_SUPPORT:
    10.8 +    SKIP("Block-attach not supported for VMX domains")
    10.9 +
   10.10  # Mount /dev/ram0
   10.11  
   10.12  s, o = traceCommand("mkfs /dev/ram0")
    11.1 --- a/tools/xm-test/tests/block-create/12_block_attach_shared_domU.py	Wed Dec 14 11:56:25 2005 +0000
    11.2 +++ b/tools/xm-test/tests/block-create/12_block_attach_shared_domU.py	Wed Dec 14 11:59:19 2005 +0000
    11.3 @@ -5,6 +5,9 @@
    11.4  
    11.5  from XmTestLib import *
    11.6  
    11.7 +if ENABLE_VMX_SUPPORT:
    11.8 +    SKIP("Block-attach not supported for VMX domains")
    11.9 +
   11.10  config = {"disk":"phy:/dev/ram0,hda1,w"}
   11.11  
   11.12  dom1 = XmTestDomain(extraConfig=config)
    12.1 --- a/tools/xm-test/tests/block-destroy/01_block-destroy_btblock_pos.py	Wed Dec 14 11:56:25 2005 +0000
    12.2 +++ b/tools/xm-test/tests/block-destroy/01_block-destroy_btblock_pos.py	Wed Dec 14 11:59:19 2005 +0000
    12.3 @@ -5,6 +5,9 @@
    12.4  
    12.5  from XmTestLib import *
    12.6  
    12.7 +if ENABLE_VMX_SUPPORT:
    12.8 +    SKIP("Block-detach not supported for VMX domains")
    12.9 +
   12.10  config = {"disk":"phy:/dev/ram0,hda1,w"}
   12.11  domain = XmTestDomain(extraConfig=config)
   12.12  
    13.1 --- a/tools/xm-test/tests/block-destroy/02_block-destroy_rtblock_pos.py	Wed Dec 14 11:56:25 2005 +0000
    13.2 +++ b/tools/xm-test/tests/block-destroy/02_block-destroy_rtblock_pos.py	Wed Dec 14 11:59:19 2005 +0000
    13.3 @@ -5,6 +5,9 @@
    13.4  
    13.5  from XmTestLib import *
    13.6  
    13.7 +if ENABLE_VMX_SUPPORT:
    13.8 +    SKIP("Block-detach not supported for VMX domains")
    13.9 +
   13.10  domain = XmTestDomain()
   13.11  
   13.12  try:
    14.1 --- a/tools/xm-test/tests/block-destroy/04_block-destroy_nonattached_neg.py	Wed Dec 14 11:56:25 2005 +0000
    14.2 +++ b/tools/xm-test/tests/block-destroy/04_block-destroy_nonattached_neg.py	Wed Dec 14 11:59:19 2005 +0000
    14.3 @@ -7,6 +7,9 @@
    14.4  
    14.5  from XmTestLib import *
    14.6  
    14.7 +if ENABLE_VMX_SUPPORT:
    14.8 +    SKIP("Block-detach not supported for VMX domains")
    14.9 +
   14.10  domain = XmTestDomain()
   14.11                                                                                                         
   14.12  try:
    15.1 --- a/tools/xm-test/tests/block-destroy/05_block-destroy_byname_pos.py	Wed Dec 14 11:56:25 2005 +0000
    15.2 +++ b/tools/xm-test/tests/block-destroy/05_block-destroy_byname_pos.py	Wed Dec 14 11:59:19 2005 +0000
    15.3 @@ -5,6 +5,9 @@
    15.4  
    15.5  from XmTestLib import *
    15.6  
    15.7 +if ENABLE_VMX_SUPPORT:
    15.8 +    SKIP("Block-detach not supported for VMX domains")
    15.9 +
   15.10  config = {"disk":"phy:/dev/ram0,hda1,w"}
   15.11  domain = XmTestDomain(extraConfig=config)
   15.12  
    16.1 --- a/tools/xm-test/tests/block-destroy/06_block-destroy_check_list_pos.py	Wed Dec 14 11:56:25 2005 +0000
    16.2 +++ b/tools/xm-test/tests/block-destroy/06_block-destroy_check_list_pos.py	Wed Dec 14 11:59:19 2005 +0000
    16.3 @@ -26,6 +26,9 @@ def checkXmLongList(domain):
    16.4      else:
    16.5          return False
    16.6  
    16.7 +if ENABLE_VMX_SUPPORT:
    16.8 +    SKIP("Block-detach not supported for VMX domains")
    16.9 +
   16.10  domain = XmTestDomain()
   16.11  
   16.12  try:
    17.1 --- a/tools/xm-test/tests/block-list/01_block-list_pos.py	Wed Dec 14 11:56:25 2005 +0000
    17.2 +++ b/tools/xm-test/tests/block-list/01_block-list_pos.py	Wed Dec 14 11:59:19 2005 +0000
    17.3 @@ -8,6 +8,9 @@
    17.4  
    17.5  from XmTestLib import *
    17.6  
    17.7 +if ENABLE_VMX_SUPPORT:
    17.8 +    SKIP("Block-list not supported for VMX domains")
    17.9 +
   17.10  config = {"disk":"phy:/dev/ram0,hda1,w"}
   17.11  domain = XmTestDomain(extraConfig=config)
   17.12  
    18.1 --- a/tools/xm-test/tests/block-list/02_block-list_attachbd_pos.py	Wed Dec 14 11:56:25 2005 +0000
    18.2 +++ b/tools/xm-test/tests/block-list/02_block-list_attachbd_pos.py	Wed Dec 14 11:59:19 2005 +0000
    18.3 @@ -8,6 +8,9 @@
    18.4  
    18.5  from XmTestLib import *
    18.6  
    18.7 +if ENABLE_VMX_SUPPORT:
    18.8 +    SKIP("Block-list not supported for VMX domains")
    18.9 +
   18.10  domain = XmTestDomain()
   18.11                                                                                                
   18.12  try:
    19.1 --- a/tools/xm-test/tests/block-list/03_block-list_anotherbd_pos.py	Wed Dec 14 11:56:25 2005 +0000
    19.2 +++ b/tools/xm-test/tests/block-list/03_block-list_anotherbd_pos.py	Wed Dec 14 11:59:19 2005 +0000
    19.3 @@ -8,6 +8,9 @@
    19.4  
    19.5  from XmTestLib import *
    19.6  
    19.7 +if ENABLE_VMX_SUPPORT:
    19.8 +    SKIP("Block-list not supported for VMX domains")
    19.9 +
   19.10  config = {"disk":"phy:/dev/ram0,hda1,w"}
   19.11  domain = XmTestDomain(extraConfig=config)
   19.12  
    20.1 --- a/tools/xm-test/tests/block-list/04_block-list_nodb_pos.py	Wed Dec 14 11:56:25 2005 +0000
    20.2 +++ b/tools/xm-test/tests/block-list/04_block-list_nodb_pos.py	Wed Dec 14 11:59:19 2005 +0000
    20.3 @@ -8,6 +8,9 @@
    20.4  
    20.5  from XmTestLib import *
    20.6  
    20.7 +if ENABLE_VMX_SUPPORT:
    20.8 +    SKIP("Block-list not supported for VMX domains")
    20.9 +
   20.10  domain = XmTestDomain()
   20.11  
   20.12  try:
   20.13 @@ -21,8 +24,5 @@ status, output = traceCommand("xm block-
   20.14  if status != 0:
   20.15      FAIL("xm block-list returned bad status, expected 0, status is %i" % status)
   20.16  
   20.17 -if ENABLE_VMX_SUPPORT:
   20.18 -    SKIP("Using block device for root, so this case does not apply")
   20.19 -
   20.20  if output != "":
   20.21      FAIL("xm block-list should not list anything for domain with no block devices")
    21.1 --- a/tools/xm-test/tests/block-list/06_block-list_checkremove_pos.py	Wed Dec 14 11:56:25 2005 +0000
    21.2 +++ b/tools/xm-test/tests/block-list/06_block-list_checkremove_pos.py	Wed Dec 14 11:59:19 2005 +0000
    21.3 @@ -5,6 +5,9 @@
    21.4  
    21.5  from XmTestLib import *
    21.6  
    21.7 +if ENABLE_VMX_SUPPORT:
    21.8 +    SKIP("Block-list not supported for VMX domains")
    21.9 +
   21.10  domain = XmTestDomain()
   21.11  
   21.12  try:
    22.1 --- a/tools/xm-test/tests/memmax/01_memmax_badparm_neg.py	Wed Dec 14 11:56:25 2005 +0000
    22.2 +++ b/tools/xm-test/tests/memmax/01_memmax_badparm_neg.py	Wed Dec 14 11:59:19 2005 +0000
    22.3 @@ -8,6 +8,8 @@ import re
    22.4  
    22.5  from XmTestLib import *
    22.6  
    22.7 +if ENABLE_VMX_SUPPORT:
    22.8 +    SKIP("Mem-max not supported for VMX domains")
    22.9  
   22.10  status, output = traceCommand("xm mem-max")
   22.11  eyecatcher = "Error:"
    23.1 --- a/tools/xm-test/tests/memset/01_memset_basic_pos.py	Wed Dec 14 11:56:25 2005 +0000
    23.2 +++ b/tools/xm-test/tests/memset/01_memset_basic_pos.py	Wed Dec 14 11:59:19 2005 +0000
    23.3 @@ -20,6 +20,9 @@ import re
    23.4  import time 
    23.5  from XmTestLib import * 
    23.6  
    23.7 +if ENABLE_VMX_SUPPORT:
    23.8 +    SKIP("Mem-set not supported for VMX domains")
    23.9 +
   23.10  # Create a domain (default XmTestDomain, with our ramdisk)
   23.11  domain = XmTestDomain() 
   23.12  
    24.1 --- a/tools/xm-test/tests/memset/02_memset_badparm_neg.py	Wed Dec 14 11:56:25 2005 +0000
    24.2 +++ b/tools/xm-test/tests/memset/02_memset_badparm_neg.py	Wed Dec 14 11:59:19 2005 +0000
    24.3 @@ -18,6 +18,9 @@ import re
    24.4  
    24.5  from XmTestLib import * 
    24.6  
    24.7 +if ENABLE_VMX_SUPPORT:
    24.8 +    SKIP("Mem-set not supported for VMX domains")
    24.9 +
   24.10  # destroy no parm input - negative test
   24.11  status, output = traceCommand("xm mem-set")
   24.12  eyecatcher = "Error:"
    25.1 --- a/tools/xm-test/tests/memset/03_memset_random_pos.py	Wed Dec 14 11:56:25 2005 +0000
    25.2 +++ b/tools/xm-test/tests/memset/03_memset_random_pos.py	Wed Dec 14 11:59:19 2005 +0000
    25.3 @@ -8,6 +8,8 @@ import re
    25.4  
    25.5  from XmTestLib import *
    25.6  
    25.7 +if ENABLE_VMX_SUPPORT:
    25.8 +    SKIP("Mem-set not supported for VMX domains")
    25.9  
   25.10  domain = XmTestDomain()
   25.11  
    26.1 --- a/tools/xm-test/tests/memset/04_memset_smallmem_pos.py	Wed Dec 14 11:56:25 2005 +0000
    26.2 +++ b/tools/xm-test/tests/memset/04_memset_smallmem_pos.py	Wed Dec 14 11:59:19 2005 +0000
    26.3 @@ -5,6 +5,9 @@
    26.4  
    26.5  from XmTestLib import *
    26.6  
    26.7 +if ENABLE_VMX_SUPPORT:
    26.8 +    SKIP("Mem-set not supported for VMX domains")
    26.9 +
   26.10  domain = XmTestDomain()
   26.11  
   26.12  try:
    27.1 --- a/tools/xm-test/tests/migrate/01_migrate_localhost_pos.py	Wed Dec 14 11:56:25 2005 +0000
    27.2 +++ b/tools/xm-test/tests/migrate/01_migrate_localhost_pos.py	Wed Dec 14 11:59:19 2005 +0000
    27.3 @@ -17,6 +17,9 @@ import commands
    27.4  
    27.5  from XmTestLib import *
    27.6  
    27.7 +if ENABLE_VMX_SUPPORT:
    27.8 +    SKIP("Migrate currently not supported for VMX domains")
    27.9 +
   27.10  # Create a domain (default XmTestDomain, with our ramdisk)
   27.11  domain = XmTestDomain()
   27.12  
    28.1 --- a/tools/xm-test/tests/network-attach/01_network_attach_pos.py	Wed Dec 14 11:56:25 2005 +0000
    28.2 +++ b/tools/xm-test/tests/network-attach/01_network_attach_pos.py	Wed Dec 14 11:59:19 2005 +0000
    28.3 @@ -8,6 +8,9 @@ import sys
    28.4  from XmTestLib import *
    28.5  from network_utils import *
    28.6  
    28.7 +if ENABLE_VMX_SUPPORT:
    28.8 +    SKIP("Network-attach not supported for VMX domains")
    28.9 +
   28.10  # Create a domain (default XmTestDomain, with our ramdisk)
   28.11  domain = XmTestDomain()
   28.12  
    29.1 --- a/tools/xm-test/tests/network-attach/02_network_attach_detach_pos.py	Wed Dec 14 11:56:25 2005 +0000
    29.2 +++ b/tools/xm-test/tests/network-attach/02_network_attach_detach_pos.py	Wed Dec 14 11:59:19 2005 +0000
    29.3 @@ -10,6 +10,9 @@ import time
    29.4  from XmTestLib import *
    29.5  from network_utils import *
    29.6  
    29.7 +if ENABLE_VMX_SUPPORT:
    29.8 +    SKIP("Network-attach not supported for VMX domains")
    29.9 +
   29.10  # Create a domain (default XmTestDomain, with our ramdisk)
   29.11  domain = XmTestDomain()
   29.12  
    30.1 --- a/tools/xm-test/tests/network-attach/03_network_attach_detach_multiple_pos.py	Wed Dec 14 11:56:25 2005 +0000
    30.2 +++ b/tools/xm-test/tests/network-attach/03_network_attach_detach_multiple_pos.py	Wed Dec 14 11:59:19 2005 +0000
    30.3 @@ -10,6 +10,9 @@ import time
    30.4  from XmTestLib import *
    30.5  from network_utils import *
    30.6  
    30.7 +if ENABLE_VMX_SUPPORT:
    30.8 +    SKIP("Network-attach not supported for VMX domains")
    30.9 +
   30.10  # Create a domain (default XmTestDomain, with our ramdisk)
   30.11  domain = XmTestDomain()
   30.12  
    31.1 --- a/tools/xm-test/tests/restore/01_restore_basic_pos.py	Wed Dec 14 11:56:25 2005 +0000
    31.2 +++ b/tools/xm-test/tests/restore/01_restore_basic_pos.py	Wed Dec 14 11:59:19 2005 +0000
    31.3 @@ -12,6 +12,9 @@ import time
    31.4  
    31.5  from XmTestLib import *
    31.6  
    31.7 +if ENABLE_VMX_SUPPORT:
    31.8 +    SKIP("Restore currently not supported for VMX domains")
    31.9 +
   31.10  domain = XmTestDomain()
   31.11  
   31.12  try:
    32.1 --- a/tools/xm-test/tests/restore/02_restore_badparm_neg.py	Wed Dec 14 11:56:25 2005 +0000
    32.2 +++ b/tools/xm-test/tests/restore/02_restore_badparm_neg.py	Wed Dec 14 11:59:19 2005 +0000
    32.3 @@ -12,6 +12,9 @@ import re
    32.4  
    32.5  from XmTestLib import *
    32.6  
    32.7 +if ENABLE_VMX_SUPPORT:
    32.8 +    SKIP("Restore currently not supported for VMX domains")
    32.9 +
   32.10  status, output = traceCommand("xm restore -x")
   32.11  eyecatcher1 = "Error:"
   32.12  eyecatcher2 = "Traceback"
    33.1 --- a/tools/xm-test/tests/restore/03_restore_badfilename_neg.py	Wed Dec 14 11:56:25 2005 +0000
    33.2 +++ b/tools/xm-test/tests/restore/03_restore_badfilename_neg.py	Wed Dec 14 11:59:19 2005 +0000
    33.3 @@ -12,6 +12,9 @@ import re
    33.4  
    33.5  from XmTestLib import *
    33.6  
    33.7 +if ENABLE_VMX_SUPPORT:
    33.8 +    SKIP("Restore currently not supported for VMX domains")
    33.9 +
   33.10  status, output = traceCommand("xm restore /tmp/NON_EXIST")
   33.11  eyecatcher1 = "Error:"
   33.12  eyecatcher2 = "Traceback"
    34.1 --- a/tools/xm-test/tests/restore/04_restore_withdevices_pos.py	Wed Dec 14 11:56:25 2005 +0000
    34.2 +++ b/tools/xm-test/tests/restore/04_restore_withdevices_pos.py	Wed Dec 14 11:59:19 2005 +0000
    34.3 @@ -7,6 +7,9 @@ from XmTestLib import *
    34.4  
    34.5  import re
    34.6  
    34.7 +if ENABLE_VMX_SUPPORT:
    34.8 +    SKIP("Restore currently not supported for VMX domains")
    34.9 +
   34.10  config = {"disk": ["phy:/dev/ram0,hda1,w", "phy:/dev/ram1,hdb2,w"],
   34.11            "vif":  ['', '']}
   34.12  domain = XmTestDomain(extraConfig=config)
    35.1 --- a/tools/xm-test/tests/save/01_save_basic_pos.py	Wed Dec 14 11:56:25 2005 +0000
    35.2 +++ b/tools/xm-test/tests/save/01_save_basic_pos.py	Wed Dec 14 11:59:19 2005 +0000
    35.3 @@ -7,6 +7,9 @@ import time
    35.4  
    35.5  from XmTestLib import *
    35.6  
    35.7 +if ENABLE_VMX_SUPPORT:
    35.8 +    SKIP("Save currently not supported for VMX domains")
    35.9 +
   35.10  domain = XmTestDomain()
   35.11  
   35.12  try:
    36.1 --- a/tools/xm-test/tests/save/02_save_badparm_neg.py	Wed Dec 14 11:56:25 2005 +0000
    36.2 +++ b/tools/xm-test/tests/save/02_save_badparm_neg.py	Wed Dec 14 11:59:19 2005 +0000
    36.3 @@ -12,6 +12,9 @@ import re
    36.4  
    36.5  from XmTestLib import *
    36.6  
    36.7 +if ENABLE_VMX_SUPPORT:
    36.8 +    SKIP("Save currently not supported for VMX domains")
    36.9 +
   36.10  status, output = traceCommand("xm save -x")
   36.11  eyecatcher1 = "Error:"
   36.12  eyecatcher2 = "Traceback"
    37.1 --- a/tools/xm-test/tests/save/03_save_bogusfile_neg.py	Wed Dec 14 11:56:25 2005 +0000
    37.2 +++ b/tools/xm-test/tests/save/03_save_bogusfile_neg.py	Wed Dec 14 11:59:19 2005 +0000
    37.3 @@ -10,6 +10,9 @@ import time
    37.4  
    37.5  from XmTestLib import *
    37.6  
    37.7 +if ENABLE_VMX_SUPPORT:
    37.8 +    SKIP("Save currently not supported for VMX domains")
    37.9 +
   37.10  domain = XmTestDomain()
   37.11  
   37.12  try:
    38.1 --- a/tools/xm-test/tests/sysrq/01_sysrq_basic_neg.py	Wed Dec 14 11:56:25 2005 +0000
    38.2 +++ b/tools/xm-test/tests/sysrq/01_sysrq_basic_neg.py	Wed Dec 14 11:59:19 2005 +0000
    38.3 @@ -9,6 +9,9 @@ import re
    38.4  
    38.5  from XmTestLib import *
    38.6  
    38.7 +if ENABLE_VMX_SUPPORT:
    38.8 +    SKIP("Sysrq not supported for VMX domains")
    38.9 +
   38.10  status, output = traceCommand("xm sysrq does_not_exist s");
   38.11  
   38.12  if status == 0:
    39.1 --- a/tools/xm-test/tests/sysrq/02_sysrq_sync_pos.py	Wed Dec 14 11:56:25 2005 +0000
    39.2 +++ b/tools/xm-test/tests/sysrq/02_sysrq_sync_pos.py	Wed Dec 14 11:59:19 2005 +0000
    39.3 @@ -9,6 +9,9 @@ import time
    39.4  
    39.5  from XmTestLib import *
    39.6  
    39.7 +if ENABLE_VMX_SUPPORT:
    39.8 +    SKIP("Sysrq not supported for VMX domains")
    39.9 +
   39.10  # Create a domain (default XmTestDomain, with our ramdisk)
   39.11  domain = XmTestDomain()
   39.12  
    40.1 --- a/tools/xm-test/tests/sysrq/03_sysrq_withreboot_pos.py	Wed Dec 14 11:56:25 2005 +0000
    40.2 +++ b/tools/xm-test/tests/sysrq/03_sysrq_withreboot_pos.py	Wed Dec 14 11:59:19 2005 +0000
    40.3 @@ -7,6 +7,9 @@ from XmTestLib import *
    40.4  
    40.5  import time
    40.6  
    40.7 +if ENABLE_VMX_SUPPORT:
    40.8 +    SKIP("Sysrq not supported for VMX domains")
    40.9 +
   40.10  domain = XmTestDomain()
   40.11  
   40.12  try: