From: Ian Jackson <ian.jackson@eu.citrix.com>
Date: Fri, 30 Nov 2018 17:16:55 +0000 (+0000)
Subject: FIX NEXT-UNIQUE-NAME
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=refs%2Fheads%2Fwip.stretch;p=people%2Fiwj%2Fosstest.git

FIX NEXT-UNIQUE-NAME
---

diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm
index 0a588fad..7bc98c52 100644
--- a/Osstest/TestSupport.pm
+++ b/Osstest/TestSupport.pm
@@ -303,6 +303,12 @@ sub get_filecontents ($;$) {
 
 #---------- stashed files ----------
 
+sub next_unique_name ($) {
+    my ($fnref) = @_;
+    my $num = $$fnref =~ s/\+([1-9]\d*)$// ? $1 : 0;
+    $$fnref .= '+'.($num+1);
+}
+
 sub open_unique_stashfile ($) {
     my ($leafref) = @_;
     my $dh;
@@ -639,12 +645,6 @@ sub target_file_exists ($$) {
     die "$rfile $out ?";
 }
 
-sub next_unique_name ($) {
-    my ($fnref) = @_;
-    my $num = $$fnref =~ s/\+([1-9]\d*)$// ? $1 : 0;
-    $$fnref .= '+'.($num+1);
-}
-
 our $target_editfile_cancel_exception =
     bless { }, 'Osstest::TestSupport::TargetEditfileCancelException';