Modified: trunk/Tools/ChangeLog (290184 => 290185)
--- trunk/Tools/ChangeLog 2022-02-19 00:28:13 UTC (rev 290184)
+++ trunk/Tools/ChangeLog 2022-02-19 00:40:18 UTC (rev 290185)
@@ -1,3 +1,18 @@
+2022-02-18 Angelos Oikonomopoulos <ange...@igalia.com>
+
+ [JSC] Fix test sharding when using --make-runner and --remote
+ https://bugs.webkit.org/show_bug.cgi?id=236560
+
+ Reviewed by Adrian Perez de Castro.
+
+ After https://commits.webkit.org/244496@main, test sharding was broken
+ for the make runner. Specifically, all remotes would get assigned all
+ tests (instead of a subset).
+
+ Fix this by propagating and using the correct value for remoteHosts.
+
+ * Scripts/webkitruby/jsc-stress-test-writer-default.rb:
+
2022-02-18 Robert Jenner <jen...@apple.com>
Unreviewed, reverting r290149.
Modified: trunk/Tools/Scripts/webkitruby/jsc-stress-test-writer-default.rb (290184 => 290185)
--- trunk/Tools/Scripts/webkitruby/jsc-stress-test-writer-default.rb 2022-02-19 00:28:13 UTC (rev 290184)
+++ trunk/Tools/Scripts/webkitruby/jsc-stress-test-writer-default.rb 2022-02-19 00:40:18 UTC (rev 290185)
@@ -356,7 +356,7 @@
outp.puts "\tsh test_script_#{index}"
target
end
- def prepareRunnerForRemote(runlist, serialPlans, completedPlans, remoteIndex)
+ def prepareRunnerForRemote(runlist, serialPlans, completedPlans, remoteHosts, remoteIndex)
# The goals of our parallel test runner are scalability and simplicity. The
# simplicity part is particularly important. We don't want to have to have
# a full-time contributor just philosophising about parallel testing.
@@ -400,7 +400,7 @@
if completedPlans.include?(plan)
next
end
- if @remoteHosts.nil? or plan.index % @remoteHosts.length == remoteIndex
+ if remoteHosts.nil? or plan.index % remoteHosts.length == remoteIndex
if serialPlans.include?(plan)
serialRunPlans << plan
else
@@ -431,11 +431,11 @@
end
def prepareRunner(runlist, serialPlans, completedPlans, remoteHosts)
if remoteHosts.nil?
- prepareRunnerForRemote(runlist, serialPlans, completedPlans, 0)
+ prepareRunnerForRemote(runlist, serialPlans, completedPlans, remoteHosts, 0)
else
remoteHosts.each_index {
|remoteIndex|
- prepareRunnerForRemote(runlist, serialPlans, completedPlans, remoteIndex)
+ prepareRunnerForRemote(runlist, serialPlans, completedPlans, remoteHosts, remoteIndex)
}
end
end
