Changeset 271427 in webkit

Timestamp:

Jan 12, 2021, 8:17:31 PM (6 years ago)

Author:

commit-queue@webkit.org

Message:

Implement serial tests for the ruby test writer
​https://bugs.webkit.org/show_bug.cgi?id=220360

Patch by Angelos Oikonomopoulos <Angelos Oikonomopoulos> on 2021-01-12
Reviewed by Yusuke Suzuki.

This is a verbatim copy of the implementation in the default writer.

• Scripts/webkitruby/jsc-stress-test-writer-ruby.rb:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitruby/jsc-stress-test-writer-ruby.rb (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2021-01-12  Angelos Oikonomopoulos  <angelos@igalia.com>
+
+        Implement serial tests for the ruby test writer
+        https://bugs.webkit.org/show_bug.cgi?id=220360
+
+        Reviewed by Yusuke Suzuki.
+
+        This is a verbatim copy of the implementation in the default writer.
+
+        * Scripts/webkitruby/jsc-stress-test-writer-ruby.rb:
+
 2021-01-12  Tetsuharu Ohzeki  <tetsuharu.ohzeki@gmail.com>
 

trunk/Tools/Scripts/webkitruby/jsc-stress-test-writer-ruby.rb

@@ -411 +411 @@
 end
 
+def output_target(outp, plan, prereqs)
+    index = plan.index
+    target = "test_done_#{index}"
+    outp.puts "#{target}: #{prereqs.join(" ")}"
+    outp.puts "\truby test_script_#{index}"
+    target
+end
+
 def prepareMakeTestRunner(remoteIndex)
-    runIndices = []
+    serialPlans = {}
+    $serialRunlist.each { |p| serialPlans[p] = nil }
+    runPlans = []
+    serialRunPlans = []
     $runlist.each {
         | plan |
         if !$remote or plan.index % $remoteHosts.length == remoteIndex
-            runIndices << plan.index
-        end
-    }
-    
+            if serialPlans.has_key?(plan)
+                serialRunPlans << plan
+            else
+                runPlans << plan
+            end
+        end
+    }
+
     File.open($runnerDir + "Makefile.#{remoteIndex}", "w") {
         | outp |
-        outp.puts("all: " + runIndices.map{|v| "test_done_#{v}"}.join(' '))
-        runIndices.each {
-            | index |
-            plan = $runlist[index]
-            outp.puts "test_done_#{index}:"
-            outp.puts "\truby test_script_#{plan.index}"
-        }
+        if serialRunPlans.empty?
+            outp.puts("all: parallel")
+        else
+            serialPrereq = "test_done_#{serialRunPlans[-1].index}"
+            outp.puts("all: #{serialPrereq}")
+            prev_target = "parallel"
+            serialRunPlans.each {
+                | plan |
+                prev_target = output_target(outp, plan, [prev_target])
+            }
+        end
+        parallelTargets = runPlans.collect {
+            | plan |
+            output_target(outp, plan, [])
+        }
+        outp.puts("parallel: " + parallelTargets.join(" "))
     }
 end