ソースを参照

+ skipemu added

florian 20 年 前
コミット
71ef1067bb
2 ファイル変更25 行追加2 行削除
  1. 21 2
      tests/utils/dotest.pp
  2. 4 0
      tests/utils/testu.pp

+ 21 - 2
tests/utils/dotest.pp

@@ -1020,7 +1020,7 @@ begin
    begin
      if Config.SkipCPU<>'' then
       begin
-        Verbose(V_Debug,'Skip compiler cpu: '+Config.NeedCPU);
+        Verbose(V_Debug,'Skip compiler cpu: '+Config.SkipCPU);
         if IsInList(CompilerCPU,Config.SkipCPU) then
          begin
            { avoid a second attempt by writing to elg file }
@@ -1032,6 +1032,22 @@ begin
       end;
    end;
 
+  if Res then
+   begin
+     if Config.SkipEmu<>'' then
+      begin
+        Verbose(V_Debug,'Skip emulator: '+emulatorname);
+        if IsInList(emulatorname,Config.SkipEmu) then
+         begin
+           { avoid a second attempt by writing to elg file }
+           AddLog(EXELogFile,skipping_other_cpu+PPFileInfo);
+           AddLog(ResLogFile,skipping_other_cpu+PPFileInfo);
+           Verbose(V_Abort,'Emulator "'+emulatorname+'" is in list "'+Config.SkipEmu+'"');
+           Res:=false;
+         end;
+      end;
+   end;
+
   if Res then
    begin
      if Config.NeedTarget<>'' then
@@ -1113,7 +1129,10 @@ begin
 end.
 {
   $Log$
-  Revision 1.43  2005-01-01 18:59:52  florian
+  Revision 1.44  2005-01-06 16:32:04  florian
+    + skipemu added
+
+  Revision 1.43  2005/01/01 18:59:52  florian
     + emulator execution support added
 
   Revision 1.42  2004/11/29 21:25:32  peter

+ 4 - 0
tests/utils/testu.pp

@@ -16,6 +16,7 @@ type
     NeedOptions,
     NeedCPU,
     SkipCPU,
+    SkipEmu,
     NeedTarget,
     SkipTarget,
     MinVersion,
@@ -178,6 +179,9 @@ begin
               else
                if GetEntry('SKIPCPU') then
                 r.SkipCPU:=res
+              else
+               if GetEntry('SKIPEMU') then
+                r.SkipEmu:=res
               else
                if GetEntry('VERSION') then
                 r.MinVersion:=res