--- Merging r29471 into '.':

U    compiler/aasmbase.pas
--- Recording mergeinfo for merge of r29471 into '.':
 U   .
--- Merging r30220 into '.':
U    tests/utils/dotest.pp
--- Recording mergeinfo for merge of r30220 into '.':
 G   .

git-svn-id: branches/fixes_3_0@32631 -

compiler/aasmbase.pas

@@ -197,7 +197,7 @@ interface
     function EncodeUleb128(a: qword;out buf) : byte;
     function EncodeSleb128(a: int64;out buf) : byte;
 
-    function ReplaceForbiddenAsmSymbolChars(const s: string): string;
+    function ReplaceForbiddenAsmSymbolChars(const s: ansistring): ansistring;
 
     { dummy default noop callback }
     procedure default_global_used;
@@ -348,7 +348,7 @@ implementation
       end;
 
 
-    function ReplaceForbiddenAsmSymbolChars(const s: string): string;
+    function ReplaceForbiddenAsmSymbolChars(const s: ansistring): ansistring;
       var
         i : longint;
         rchar: char;

tests/utils/dotest.pp

@@ -380,8 +380,13 @@ begin
       Err := IOResult;
       if Err <> 0 then
        begin
-        Str (Err, SErr);
-        Verbose (V_Error, 'Directory creation failed ' + SErr);
+        { did another parallel instance create it in the mean time? }
+        if not PathExists(hs) then
+          begin
+            { no -> error }
+            Str (Err, SErr);
+            Verbose (V_Error, 'Directory creation of "'+HS+'" failed ' + SErr);
+          end;
        end;
     end;
 end;