[PATCH 1/2] testbot/LibvirtTool: Only create locale snapshots for Windows VMs.

[Francois Gouget]

This is the only supported and needed case.

Signed-off-by: Francois Gouget 
---
 testbot/bin/LibvirtTool.pl | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl
index f6e2d4f60..b2f54f2c8 100755
--- a/testbot/bin/LibvirtTool.pl
+++ b/testbot/bin/LibvirtTool.pl
@@ -495,7 +495,8 @@ sub Revert()
   my ($SetLocale, $CreateSnapshot);

my $Domain = $VM->GetDomain();
-  if (!$Domain->HasSnapshot($DomainSnapshot) and
+  if (($VM->Type eq "win32" or $VM->Type eq "win64") and
+      !$Domain->HasSnapshot($DomainSnapshot) and
       $DomainSnapshot =~ s/-([a-z]{2})[_-]([A-Z]{2})$//)
   {
     # Add some extra time to set up the VM locale and reboot it

[PATCH 2/2] testbot/LibvirtTool: Only allow dashes in the locale snapshot names.

[Francois Gouget]

Matching the Windows locale syntax makes it easier to interface with
SetWinLocale.

Signed-off-by: Francois Gouget 
---
 testbot/bin/LibvirtTool.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl
index b2f54f2c8..cc22435c5 100755
--- a/testbot/bin/LibvirtTool.pl
+++ b/testbot/bin/LibvirtTool.pl
@@ -497,7 +497,7 @@ sub Revert()
   my $Domain = $VM->GetDomain();
   if (($VM->Type eq "win32" or $VM->Type eq "win64") and
       !$Domain->HasSnapshot($DomainSnapshot) and
-      $DomainSnapshot =~ s/-([a-z]{2})[_-]([A-Z]{2})$//)
+      $DomainSnapshot =~ s/-([a-z]{2})-([A-Z]{2})$//)
   {
     # Add some extra time to set up the VM locale and reboot it
     $ExtraTimeout += $VMToolTimeout;