cleanup

SunSerega · Oct 23, 2023 · a1f6e76 · a1f6e76
1 parent c04393e
commit a1f6e76
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/Modules.Packed/OpenCLABC.pas b/Modules.Packed/OpenCLABC.pas
@@ -3263,7 +3263,7 @@   CLArrayProperties = class
 
     public function TestSanity(test_size: integer := 1024*24): TimeSpan?;
 
-    public static function GenerateAndCheckAllPossible(test_size: integer := 1024*24; test_max_seconds: real := 0.5): List<ValueTuple<CLContext,TimeSpan>>;
+    public static function GenerateAndCheckAllPossible(test_size: integer := 1024*24; test_max_seconds: real := 5): List<ValueTuple<CLContext,TimeSpan>>;
 
     private static function LoadTestContext: CLContext;
 
@@ -35432,6 +35432,7 @@ function CLContext.TestSanity(test_size: integer): TimeSpan?;
     for var i := 0 to dvcs.Count-1 do
       if not keep[i] then dvcs[i] := nil;
     dvcs.RemoveAll(d->d=nil);
+    if dvcs.Count=0 then continue;
 
     var chosen := new List<CLDevice>(dvcs.Count);
     foreach var choise in |true,false|.CartesianPower(dvcs.Count) do

diff --git a/Packing/Descriptions/OpenCLABC.predoc b/Packing/Descriptions/OpenCLABC.predoc
@@ -3159,7 +3159,7 @@ type
 
     public function TestSanity(test_size: integer := 1024*24): TimeSpan?;
 
-    public static function GenerateAndCheckAllPossible(test_size: integer := 1024*24; test_max_seconds: real := 0.5): List<ValueTuple<CLContext,TimeSpan>>;
+    public static function GenerateAndCheckAllPossible(test_size: integer := 1024*24; test_max_seconds: real := 5): List<ValueTuple<CLContext,TimeSpan>>;
 
     private static function LoadTestContext: CLContext;
 
@@ -34357,6 +34357,7 @@ begin
     for var i := 0 to dvcs.Count-1 do
       if not keep[i] then dvcs[i] := nil;
     dvcs.RemoveAll(d->d=nil);
+    if dvcs.Count=0 then continue;
 
     var chosen := new List<CLDevice>(dvcs.Count);
     foreach var choise in |true,false|.CartesianPower(dvcs.Count) do

diff --git a/Tests/CLContextGen.pas b/Tests/CLContextGen.pas
@@ -9,10 +9,14 @@
 begin
   var bw := new System.IO.BinaryWriter(System.IO.File.Create($'{dir}/{i}.dat'));
 
-  bw.Write(c.MainDevice.BaseCLPlatform.Properties.Name);
+  $'Platform:'.Print;
+  bw.Write(c.MainDevice.BaseCLPlatform.Properties.Name.Println);
   bw.Write(c.AllDevices.Count);
   foreach var dvc in c.AllDevices do
-    bw.Write(dvc.Properties.Name);
+  begin
+    $'Device:'.Print;
+    bw.Write(dvc.Properties.Name.Println);
+  end;
 
   bw.Close;
 end;
diff --git a/Tests/Tester.pas b/Tests/Tester.pas
@@ -543,7 +543,7 @@
       Otp($'Running Tests/CLContextGen.exe');
       RunFile('Tests/CLContextGen.exe', nil,
         new_timer->(core_timer.cl_context_gen_exec := SimpleTimer(new_timer)),
-        l->exit(), nil
+        l->Otp($'CLContextGen: {l}', lk_console_only), nil
       );
       Otp($'Finished running Tests/CLContextGen.exe');