226385 2021-05-28 11:39:14 -0700 [JSC] Fix run-jsc-stress-tests missing escape $ 2021-06-01 02:41:24 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=225803 InRadar P2 Normal --- 1 zhifei_fang zhifei_fang angelos aperez ap darin jbedard webkit-bug-importer zhifei_fang oldest_to_newest 1764852 0 zhifei_fang 2021-05-28 11:39:14 -0700 [JSC] Fix run-jsc-stress-tests missing escape $ 1764854 1 430033 zhifei_fang 2021-05-28 11:39:42 -0700 Created attachment 430033 Patch 1764858 2 430033 ap 2021-05-28 11:44:04 -0700 Comment on attachment 430033 Patch rs=me 1764884 3 ews-feeder 2021-05-28 12:40:34 -0700 Committed r278218 (238257@main): <https://commits.webkit.org/238257@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 430033. 1764885 4 webkit-bug-importer 2021-05-28 12:41:16 -0700 <rdar://problem/78628571> 1764891 5 zhifei_fang 2021-05-28 12:49:54 -0700 Reopening to attach new patch. 1764892 6 430044 zhifei_fang 2021-05-28 12:49:55 -0700 Created attachment 430044 Patch 1764895 7 430044 ap 2021-05-28 13:02:54 -0700 Comment on attachment 430044 Patch rs=me 1764939 8 430055 zhifei_fang 2021-05-28 14:43:00 -0700 Created attachment 430055 Patch 1764941 9 zhifei_fang 2021-05-28 14:43:43 -0700 Test patch with MIPS JSC EWS 1764943 10 430057 zhifei_fang 2021-05-28 14:47:14 -0700 Created attachment 430057 Patch 1764956 11 430057 ap 2021-05-28 15:07:49 -0700 Comment on attachment 430057 Patch I'm just going to keep saying rs=me until it lands :) 1764999 12 430072 zhifei_fang 2021-05-28 16:33:32 -0700 Created attachment 430072 Patch 1765000 13 zhifei_fang 2021-05-28 16:34:07 -0700 uh, back to the complex solution. Test with EWS. 1765065 14 ews-feeder 2021-05-28 21:34:19 -0700 Committed r278234 (238271@main): <https://commits.webkit.org/238271@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 430072. 1765119 15 430072 darin 2021-05-29 13:43:19 -0700 Comment on attachment 430072 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=430072&action=review > Tools/ChangeLog:3 > + [JSC] Escape $ only when run with SSH Why? 1765379 16 angelos 2021-05-31 03:48:10 -0700 So, AFAIU this happens when using `--remote-config-file` but not `--gnu-parallel-runner`, right? The symptom I see is: sh: line 0: cd: ../.vm: No such file or directory sh: line 0: cd: ../.vm/..: No such file or directory Which does not result into any errors for me (which I guess is why I didn't notice this when testing). Presumably, that's because I've been testing with $hostOS == "linux" so have been taking the path (in prepareBundle) that runs generate-bundle. As generate-bundle creates a shell wrapper that sets LD_LIBRARY_PATH, I guess the value of LD_LIBRARY_PATH doesn't matter on linux. That said, it would be great to know which configuration this failed on! IIUC, this could be fixed by switching to single quotes around the remoteScript (in runTestRunner). At the very least, this makes the symptom above go away for me. The patch would be: diff --git a/Tools/Scripts/run-jsc-stress-tests b/Tools/Scripts/run-jsc-stress-tests index e6141b5e7249..0c24c3d5f398 100755 --- a/Tools/Scripts/run-jsc-stress-tests +++ b/Tools/Scripts/run-jsc-stress-tests @@ -2197,14 +2197,9 @@ def copyBundleToRemote(remoteHost) mysys(["scp", "-o", "NoHostAuthenticationForLocalhost=yes", "-P", remoteHost.port.to_s, ($outputDir.dirname + $tarFileName).to_s, "#{remoteHost.user}@#{remoteHost.host}:#{remoteHost.remoteDirectory}"]) end -def exportBaseEnvironmentVariables(escape) - if escape - dyldFrameworkPath = "\\$(cd #{$testingFrameworkPath.dirname}; pwd)" - ldLibraryPath = "\\$(cd #{$testingFrameworkPath.dirname}/..; pwd)/#{$jscPath.dirname}" - else - dyldFrameworkPath = "\$(cd #{$testingFrameworkPath.dirname}; pwd)" - ldLibraryPath = "\$(cd #{$testingFrameworkPath.dirname}/..; pwd)/#{$jscPath.dirname}" - end +def exportBaseEnvironmentVariables + dyldFrameworkPath = "\$(cd #{$testingFrameworkPath.dirname}; pwd)" + ldLibraryPath = "\$(cd #{$testingFrameworkPath.dirname}/..; pwd)/#{$jscPath.dirname}" [ "export DYLD_FRAMEWORK_PATH=#{dyldFrameworkPath} && ", "export LD_LIBRARY_PATH=#{ldLibraryPath} &&", @@ -2220,14 +2215,14 @@ def runTestRunner(remoteIndex=0) remoteHost = $remoteHosts[remoteIndex] getRemoteDirectoryIfNeeded(remoteHost) copyBundleToRemote(remoteHost) - remoteScript = "\"" + remoteScript = "'" remoteScript += "cd #{remoteHost.remoteDirectory} && " remoteScript += "rm -rf #{$outputDir.basename} && " remoteScript += "tar xzf #{$tarFileName} && " remoteScript += "cd #{$outputDir.basename}/.runner && " - remoteScript += exportBaseEnvironmentVariables(true) + remoteScript += exportBaseEnvironmentVariables $envVars.each { |var| remoteScript += "export " << var << "\n" } - remoteScript += "#{testRunnerCommand(remoteIndex)}\"" + remoteScript += "#{testRunnerCommand(remoteIndex)}'" runAndMonitorTestRunnerCommand(["ssh", "-o", "NoHostAuthenticationForLocalhost=yes", "-p", remoteHost.port.to_s, "#{remoteHost.user}@#{remoteHost.host}", remoteScript]) else Dir.chdir($runnerDir) { @@ -2637,7 +2632,7 @@ def runGnuParallelRunner(remoteHosts, inputs, options={}) "--timeout", timeout.to_s, "-a", inputs, "if test -e #{$outputDir.basename}/.runner; then cd #{$outputDir.basename}/.runner; else echo #{PARALLEL_REMOTE_STATE_LOST_MARKER}; false; fi && " + - exportBaseEnvironmentVariables(false) + + exportBaseEnvironmentVariables + $envVars.collect { |var | "export #{var} &&"}.join("") + "sh " ] 1765539 17 zhifei_fang 2021-06-01 02:40:18 -0700 (In reply to Darin Adler from comment #15) > Comment on attachment 430072 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=430072&action=review > > > Tools/ChangeLog:3 > > + [JSC] Escape $ only when run with SSH > > Why? We have to run path, with --remote-config-file, we will run the script with SSH, without escape &, that will be considered as a local script instead of part command string running remotely. We also have --gnu-parallel-runner, with this we should not escape $, since that will be part of the script that needed to be run locally. 1765540 18 zhifei_fang 2021-06-01 02:41:24 -0700 (In reply to Angelos Oikonomopoulos from comment #16) > So, AFAIU this happens when using `--remote-config-file` but not > `--gnu-parallel-runner`, right? The symptom I see is: > > sh: line 0: cd: ../.vm: No such file or directory > sh: line 0: cd: ../.vm/..: No such file or directory > > Which does not result into any errors for me (which I guess is why I didn't > notice this when testing). Presumably, that's because I've been testing with > $hostOS == "linux" so have been taking the path (in prepareBundle) that runs > generate-bundle. As generate-bundle creates a shell wrapper that sets > LD_LIBRARY_PATH, I guess the value of LD_LIBRARY_PATH doesn't matter on > linux. > > That said, it would be great to know which configuration this failed on! > > IIUC, this could be fixed by switching to single quotes around the > remoteScript (in runTestRunner). At the very least, this makes the symptom > above go away for me. The patch would be: > > diff --git a/Tools/Scripts/run-jsc-stress-tests > b/Tools/Scripts/run-jsc-stress-tests > index e6141b5e7249..0c24c3d5f398 100755 > --- a/Tools/Scripts/run-jsc-stress-tests > +++ b/Tools/Scripts/run-jsc-stress-tests > @@ -2197,14 +2197,9 @@ def copyBundleToRemote(remoteHost) > mysys(["scp", "-o", "NoHostAuthenticationForLocalhost=yes", "-P", > remoteHost.port.to_s, ($outputDir.dirname + $tarFileName).to_s, > "#{remoteHost.user}@#{remoteHost.host}:#{remoteHost.remoteDirectory}"]) > end > > -def exportBaseEnvironmentVariables(escape) > - if escape > - dyldFrameworkPath = "\\$(cd #{$testingFrameworkPath.dirname}; pwd)" > - ldLibraryPath = "\\$(cd #{$testingFrameworkPath.dirname}/..; > pwd)/#{$jscPath.dirname}" > - else > - dyldFrameworkPath = "\$(cd #{$testingFrameworkPath.dirname}; pwd)" > - ldLibraryPath = "\$(cd #{$testingFrameworkPath.dirname}/..; > pwd)/#{$jscPath.dirname}" > - end > +def exportBaseEnvironmentVariables > + dyldFrameworkPath = "\$(cd #{$testingFrameworkPath.dirname}; pwd)" > + ldLibraryPath = "\$(cd #{$testingFrameworkPath.dirname}/..; > pwd)/#{$jscPath.dirname}" > [ > "export DYLD_FRAMEWORK_PATH=#{dyldFrameworkPath} && ", > "export LD_LIBRARY_PATH=#{ldLibraryPath} &&", > @@ -2220,14 +2215,14 @@ def runTestRunner(remoteIndex=0) > remoteHost = $remoteHosts[remoteIndex] > getRemoteDirectoryIfNeeded(remoteHost) > copyBundleToRemote(remoteHost) > - remoteScript = "\"" > + remoteScript = "'" > remoteScript += "cd #{remoteHost.remoteDirectory} && " > remoteScript += "rm -rf #{$outputDir.basename} && " > remoteScript += "tar xzf #{$tarFileName} && " > remoteScript += "cd #{$outputDir.basename}/.runner && " > - remoteScript += exportBaseEnvironmentVariables(true) > + remoteScript += exportBaseEnvironmentVariables > $envVars.each { |var| remoteScript += "export " << var << "\n" } > - remoteScript += "#{testRunnerCommand(remoteIndex)}\"" > + remoteScript += "#{testRunnerCommand(remoteIndex)}'" > runAndMonitorTestRunnerCommand(["ssh", "-o", > "NoHostAuthenticationForLocalhost=yes", "-p", remoteHost.port.to_s, > "#{remoteHost.user}@#{remoteHost.host}", remoteScript]) > else > Dir.chdir($runnerDir) { > @@ -2637,7 +2632,7 @@ def runGnuParallelRunner(remoteHosts, inputs, > options={}) > "--timeout", timeout.to_s, > "-a", inputs, > "if test -e #{$outputDir.basename}/.runner; then cd > #{$outputDir.basename}/.runner; else echo > #{PARALLEL_REMOTE_STATE_LOST_MARKER}; false; fi && " + > - exportBaseEnvironmentVariables(false) + > + exportBaseEnvironmentVariables + > $envVars.collect { |var | "export #{var} &&"}.join("") + > "sh " > ] Yeah, the issue here is export is using pwd, with the cd part failed, it won't export to the right path when run with remote device. 430033 2021-05-28 11:39:42 -0700 2021-05-28 12:49:52 -0700 Patch bug-226385-20210528113941.patch text/plain 1411 zhifei_fang U3VidmVyc2lvbiBSZXZpc2lvbjogMjc4MTg3CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZDAwODA1YzBjOTRiNjJhZmM0MDEzNDU1MWZjNzBhNzE3 Mjc4Zjg2MS4uOGNlNTk4YjhiYjY1M2IwMzZkMmRkMTdmMjI3MDQxYThlZTBiNjhlNyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEy IEBACisyMDIxLTA1LTI4ICBaaGlmZWkgRmFuZyAgPHpoaWZlaV9mYW5nQGFwcGxlLmNvbT4KKwor ICAgICAgICBbSlNDXSBGaXggcnVuLWpzYy1zdHJlc3MtdGVzdHMgbWlzc2luZyBlc2NhcGUgJAor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI2Mzg1CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTY3JpcHRz L3J1bi1qc2Mtc3RyZXNzLXRlc3RzOgorCiAyMDIxLTA1LTI3ICBKb25hdGhhbiBCZWRhcmQgIDxq YmVkYXJkQGFwcGxlLmNvbT4KIAogICAgICAgICBbd2Via2l0Y29yZXldIEdyYWNlZnVsbHkgaGFu ZGxlIENOVFJMLUMgaW4gVGFza1Bvb2wKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvcnVuLWpz Yy1zdHJlc3MtdGVzdHMgYi9Ub29scy9TY3JpcHRzL3J1bi1qc2Mtc3RyZXNzLXRlc3RzCmluZGV4 IGExYjViZmVkM2ZjOTgwMzlhNmY3OTdjNjVlMTM1N2MyYjNmMGQzMzcuLmU2M2YzYjBmMGNmNzZj MzkyYmE3Y2MyODVhMjU4YzgwYTZiZGYxYmQgMTAwNzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvcnVu LWpzYy1zdHJlc3MtdGVzdHMKKysrIGIvVG9vbHMvU2NyaXB0cy9ydW4tanNjLXN0cmVzcy10ZXN0 cwpAQCAtMjE5OCw4ICsyMTk4LDggQEAgZGVmIGNvcHlCdW5kbGVUb1JlbW90ZShyZW1vdGVIb3N0 KQogZW5kCiAKIGRlZiBleHBvcnRCYXNlRW52aXJvbm1lbnRWYXJpYWJsZXMKLSAgICBkeWxkRnJh bWV3b3JrUGF0aCA9ICJcJChjZCAjeyR0ZXN0aW5nRnJhbWV3b3JrUGF0aC5kaXJuYW1lfTsgcHdk KSIKLSAgICBsZExpYnJhcnlQYXRoID0gIlwkKGNkICN7JHRlc3RpbmdGcmFtZXdvcmtQYXRoLmRp cm5hbWV9Ly4uOyBwd2QpLyN7JGpzY1BhdGguZGlybmFtZX0iCisgICAgZHlsZEZyYW1ld29ya1Bh dGggPSAiXFwkKGNkICN7JHRlc3RpbmdGcmFtZXdvcmtQYXRoLmRpcm5hbWV9OyBwd2QpIgorICAg IGxkTGlicmFyeVBhdGggPSAiXFwkKGNkICN7JHRlc3RpbmdGcmFtZXdvcmtQYXRoLmRpcm5hbWV9 Ly4uOyBwd2QpLyN7JGpzY1BhdGguZGlybmFtZX0iCiAgICAgWwogICAgICAgICAiZXhwb3J0IERZ TERfRlJBTUVXT1JLX1BBVEg9I3tkeWxkRnJhbWV3b3JrUGF0aH0gJiYgIiwKICAgICAgICAgImV4 cG9ydCBMRF9MSUJSQVJZX1BBVEg9I3tsZExpYnJhcnlQYXRofSAmJiIsCg== 430044 2021-05-28 12:49:55 -0700 2021-05-28 14:42:58 -0700 Patch bug-226385-20210528124954.patch text/plain 1622 zhifei_fang U3VidmVyc2lvbiBSZXZpc2lvbjogMjc4MjE4CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggM2FkNDBjNTc0NjFiNjJkZDA4ZjZkZWVmZGQxNmYzY2Qw N2MzYWMwMC4uZTIxZTgwNjI5NWU0NmM3NWNkMjU3NjM3NTBiYWI0MjBiZThkZjA1NyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEy IEBACisyMDIxLTA1LTI4ICBaaGlmZWkgRmFuZyAgPHpoaWZlaV9mYW5nQGFwcGxlLmNvbT4KKwor ICAgICAgICBbSlNDXSBFc2NhcGUgJCBvbmx5IHdoZW4gcnVuIG9uIHJlbW90ZSBkZXZpY2UKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNjM4NQorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogU2NyaXB0cy9y dW4tanNjLXN0cmVzcy10ZXN0czoKKwogMjAyMS0wNS0yOCAgWmhpZmVpIEZhbmcgIDx6aGlmZWlf ZmFuZ0BhcHBsZS5jb20+CiAKICAgICAgICAgW0pTQ10gRml4IHJ1bi1qc2Mtc3RyZXNzLXRlc3Rz IG1pc3NpbmcgZXNjYXBlICQKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvcnVuLWpzYy1zdHJl c3MtdGVzdHMgYi9Ub29scy9TY3JpcHRzL3J1bi1qc2Mtc3RyZXNzLXRlc3RzCmluZGV4IGU2M2Yz YjBmMGNmNzZjMzkyYmE3Y2MyODVhMjU4YzgwYTZiZGYxYmQuLjk1YjMzNWQ5NmU1ODI4M2RhMjdk YTBlZGE4NDZlOWE4NGI3MTU4YzcgMTAwNzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvcnVuLWpzYy1z dHJlc3MtdGVzdHMKKysrIGIvVG9vbHMvU2NyaXB0cy9ydW4tanNjLXN0cmVzcy10ZXN0cwpAQCAt MjE5OCw4ICsyMTk4LDEzIEBAIGRlZiBjb3B5QnVuZGxlVG9SZW1vdGUocmVtb3RlSG9zdCkKIGVu ZAogCiBkZWYgZXhwb3J0QmFzZUVudmlyb25tZW50VmFyaWFibGVzCi0gICAgZHlsZEZyYW1ld29y a1BhdGggPSAiXFwkKGNkICN7JHRlc3RpbmdGcmFtZXdvcmtQYXRoLmRpcm5hbWV9OyBwd2QpIgot ICAgIGxkTGlicmFyeVBhdGggPSAiXFwkKGNkICN7JHRlc3RpbmdGcmFtZXdvcmtQYXRoLmRpcm5h bWV9Ly4uOyBwd2QpLyN7JGpzY1BhdGguZGlybmFtZX0iCisgICAgaWYgJHJlbW90ZQorICAgICAg ICBkeWxkRnJhbWV3b3JrUGF0aCA9ICJcXCQoY2QgI3skdGVzdGluZ0ZyYW1ld29ya1BhdGguZGly bmFtZX07IHB3ZCkiCisgICAgICAgIGxkTGlicmFyeVBhdGggPSAiXFwkKGNkICN7JHRlc3RpbmdG cmFtZXdvcmtQYXRoLmRpcm5hbWV9Ly4uOyBwd2QpLyN7JGpzY1BhdGguZGlybmFtZX0iCisgICAg ZWxzZQorICAgICAgICBkeWxkRnJhbWV3b3JrUGF0aCA9ICJcJChjZCAjeyR0ZXN0aW5nRnJhbWV3 b3JrUGF0aC5kaXJuYW1lfTsgcHdkKSIKKyAgICAgICAgbGRMaWJyYXJ5UGF0aCA9ICJcJChjZCAj eyR0ZXN0aW5nRnJhbWV3b3JrUGF0aC5kaXJuYW1lfS8uLjsgcHdkKS8jeyRqc2NQYXRoLmRpcm5h bWV9IgorICAgIGVuZAogICAgIFsKICAgICAgICAgImV4cG9ydCBEWUxEX0ZSQU1FV09SS19QQVRI PSN7ZHlsZEZyYW1ld29ya1BhdGh9ICYmICIsCiAgICAgICAgICJleHBvcnQgTERfTElCUkFSWV9Q QVRIPSN7bGRMaWJyYXJ5UGF0aH0gJiYiLAo= 430055 2021-05-28 14:43:00 -0700 2021-05-28 14:47:13 -0700 Patch bug-226385-20210528144259.patch text/plain 3041 zhifei_fang U3VidmVyc2lvbiBSZXZpc2lvbjogMjc4MjE4CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggM2FkNDBjNTc0NjFiNjJkZDA4ZjZkZWVmZGQxNmYzY2Qw N2MzYWMwMC4uOGVhZTEwZDM5ZmMwNzUwYWNiZWRiMWVkZjhiZGEwMjhkMDIzZTQzNiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEy IEBACisyMDIxLTA1LTI4ICBaaGlmZWkgRmFuZyAgPHpoaWZlaV9mYW5nQGFwcGxlLmNvbT4KKwor ICAgICAgICBbSlNDXSBFc2NhcGUgJCBvbmx5IHdoZW4gcnVuIHdpdGggU1NICisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjYzODUKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFNjcmlwdHMvcnVuLWpzYy1z dHJlc3MtdGVzdHM6CisKIDIwMjEtMDUtMjggIFpoaWZlaSBGYW5nICA8emhpZmVpX2ZhbmdAYXBw bGUuY29tPgogCiAgICAgICAgIFtKU0NdIEZpeCBydW4tanNjLXN0cmVzcy10ZXN0cyBtaXNzaW5n IGVzY2FwZSAkCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3J1bi1qc2Mtc3RyZXNzLXRlc3Rz IGIvVG9vbHMvU2NyaXB0cy9ydW4tanNjLXN0cmVzcy10ZXN0cwppbmRleCBlNjNmM2IwZjBjZjc2 YzM5MmJhN2NjMjg1YTI1OGM4MGE2YmRmMWJkLi5lNjE0MWI1ZTcyNDlhMGQzM2MwMzIyNTkyM2Nl ZTAxNzJkYTVmMGQzIDEwMDc1NQotLS0gYS9Ub29scy9TY3JpcHRzL3J1bi1qc2Mtc3RyZXNzLXRl c3RzCisrKyBiL1Rvb2xzL1NjcmlwdHMvcnVuLWpzYy1zdHJlc3MtdGVzdHMKQEAgLTIxOTcsOSAr MjE5NywxNCBAQCBkZWYgY29weUJ1bmRsZVRvUmVtb3RlKHJlbW90ZUhvc3QpCiAgICAgbXlzeXMo WyJzY3AiLCAiLW8iLCAiTm9Ib3N0QXV0aGVudGljYXRpb25Gb3JMb2NhbGhvc3Q9eWVzIiwgIi1Q IiwgcmVtb3RlSG9zdC5wb3J0LnRvX3MsICgkb3V0cHV0RGlyLmRpcm5hbWUgKyAkdGFyRmlsZU5h bWUpLnRvX3MsICIje3JlbW90ZUhvc3QudXNlcn1AI3tyZW1vdGVIb3N0Lmhvc3R9OiN7cmVtb3Rl SG9zdC5yZW1vdGVEaXJlY3Rvcnl9Il0pCiBlbmQKIAotZGVmIGV4cG9ydEJhc2VFbnZpcm9ubWVu dFZhcmlhYmxlcwotICAgIGR5bGRGcmFtZXdvcmtQYXRoID0gIlxcJChjZCAjeyR0ZXN0aW5nRnJh bWV3b3JrUGF0aC5kaXJuYW1lfTsgcHdkKSIKLSAgICBsZExpYnJhcnlQYXRoID0gIlxcJChjZCAj eyR0ZXN0aW5nRnJhbWV3b3JrUGF0aC5kaXJuYW1lfS8uLjsgcHdkKS8jeyRqc2NQYXRoLmRpcm5h bWV9IgorZGVmIGV4cG9ydEJhc2VFbnZpcm9ubWVudFZhcmlhYmxlcyhlc2NhcGUpCisgICAgaWYg ZXNjYXBlCisgICAgICAgIGR5bGRGcmFtZXdvcmtQYXRoID0gIlxcJChjZCAjeyR0ZXN0aW5nRnJh bWV3b3JrUGF0aC5kaXJuYW1lfTsgcHdkKSIKKyAgICAgICAgbGRMaWJyYXJ5UGF0aCA9ICJcXCQo Y2QgI3skdGVzdGluZ0ZyYW1ld29ya1BhdGguZGlybmFtZX0vLi47IHB3ZCkvI3skanNjUGF0aC5k aXJuYW1lfSIKKyAgICBlbHNlCisgICAgICAgIGR5bGRGcmFtZXdvcmtQYXRoID0gIlwkKGNkICN7 JHRlc3RpbmdGcmFtZXdvcmtQYXRoLmRpcm5hbWV9OyBwd2QpIgorICAgICAgICBsZExpYnJhcnlQ YXRoID0gIlwkKGNkICN7JHRlc3RpbmdGcmFtZXdvcmtQYXRoLmRpcm5hbWV9Ly4uOyBwd2QpLyN7 JGpzY1BhdGguZGlybmFtZX0iCisgICAgZW5kCiAgICAgWwogICAgICAgICAiZXhwb3J0IERZTERf RlJBTUVXT1JLX1BBVEg9I3tkeWxkRnJhbWV3b3JrUGF0aH0gJiYgIiwKICAgICAgICAgImV4cG9y dCBMRF9MSUJSQVJZX1BBVEg9I3tsZExpYnJhcnlQYXRofSAmJiIsCkBAIC0yMjIwLDcgKzIyMjUs NyBAQCBkZWYgcnVuVGVzdFJ1bm5lcihyZW1vdGVJbmRleD0wKQogICAgICAgICByZW1vdGVTY3Jp cHQgKz0gInJtIC1yZiAjeyRvdXRwdXREaXIuYmFzZW5hbWV9ICYmICIKICAgICAgICAgcmVtb3Rl U2NyaXB0ICs9ICJ0YXIgeHpmICN7JHRhckZpbGVOYW1lfSAmJiAiCiAgICAgICAgIHJlbW90ZVNj cmlwdCArPSAiY2QgI3skb3V0cHV0RGlyLmJhc2VuYW1lfS8ucnVubmVyICYmICIKLSAgICAgICAg cmVtb3RlU2NyaXB0ICs9IGV4cG9ydEJhc2VFbnZpcm9ubWVudFZhcmlhYmxlcworICAgICAgICBy ZW1vdGVTY3JpcHQgKz0gZXhwb3J0QmFzZUVudmlyb25tZW50VmFyaWFibGVzKHRydWUpCiAgICAg ICAgICRlbnZWYXJzLmVhY2ggeyB8dmFyfCByZW1vdGVTY3JpcHQgKz0gImV4cG9ydCAiIDw8IHZh ciA8PCAiXG4iIH0KICAgICAgICAgcmVtb3RlU2NyaXB0ICs9ICIje3Rlc3RSdW5uZXJDb21tYW5k KHJlbW90ZUluZGV4KX1cIiIKICAgICAgICAgcnVuQW5kTW9uaXRvclRlc3RSdW5uZXJDb21tYW5k KFsic3NoIiwgIi1vIiwgIk5vSG9zdEF1dGhlbnRpY2F0aW9uRm9yTG9jYWxob3N0PXllcyIsICIt cCIsIHJlbW90ZUhvc3QucG9ydC50b19zLCAiI3tyZW1vdGVIb3N0LnVzZXJ9QCN7cmVtb3RlSG9z dC5ob3N0fSIsIHJlbW90ZVNjcmlwdF0pCkBAIC0yNjMyLDcgKzI2MzcsNyBAQCBkZWYgcnVuR251 UGFyYWxsZWxSdW5uZXIocmVtb3RlSG9zdHMsIGlucHV0cywgb3B0aW9ucz17fSkKICAgICAgICAg ICAgICItLXRpbWVvdXQiLCB0aW1lb3V0LnRvX3MsCiAgICAgICAgICAgICAiLWEiLCBpbnB1dHMs CiAgICAgICAgICAgICAiaWYgdGVzdCAtZSAjeyRvdXRwdXREaXIuYmFzZW5hbWV9Ly5ydW5uZXI7 IHRoZW4gY2QgI3skb3V0cHV0RGlyLmJhc2VuYW1lfS8ucnVubmVyOyBlbHNlIGVjaG8gI3tQQVJB TExFTF9SRU1PVEVfU1RBVEVfTE9TVF9NQVJLRVJ9OyBmYWxzZTsgZmkgJiYgIiArCi0gICAgICAg ICAgICBleHBvcnRCYXNlRW52aXJvbm1lbnRWYXJpYWJsZXMgKworICAgICAgICAgICAgZXhwb3J0 QmFzZUVudmlyb25tZW50VmFyaWFibGVzKGZhbHNlKSArCiAgICAgICAgICAgICAkZW52VmFycy5j b2xsZWN0IHsgfHZhciB8ICJleHBvcnQgI3t2YXJ9ICYmIn0uam9pbigiIikgKwogICAgICAgICAg ICAgInNoICIKICAgICAgICAgXQo= 430057 2021-05-28 14:47:14 -0700 2021-05-28 16:33:30 -0700 Patch bug-226385-20210528144714.patch text/plain 1582 zhifei_fang U3VidmVyc2lvbiBSZXZpc2lvbjogMjc4MjE4CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggM2FkNDBjNTc0NjFiNjJkZDA4ZjZkZWVmZGQxNmYzY2Qw N2MzYWMwMC4uOGVhZTEwZDM5ZmMwNzUwYWNiZWRiMWVkZjhiZGEwMjhkMDIzZTQzNiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEy IEBACisyMDIxLTA1LTI4ICBaaGlmZWkgRmFuZyAgPHpoaWZlaV9mYW5nQGFwcGxlLmNvbT4KKwor ICAgICAgICBbSlNDXSBFc2NhcGUgJCBvbmx5IHdoZW4gcnVuIHdpdGggU1NICisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjYzODUKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFNjcmlwdHMvcnVuLWpzYy1z dHJlc3MtdGVzdHM6CisKIDIwMjEtMDUtMjggIFpoaWZlaSBGYW5nICA8emhpZmVpX2ZhbmdAYXBw bGUuY29tPgogCiAgICAgICAgIFtKU0NdIEZpeCBydW4tanNjLXN0cmVzcy10ZXN0cyBtaXNzaW5n IGVzY2FwZSAkCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3J1bi1qc2Mtc3RyZXNzLXRlc3Rz IGIvVG9vbHMvU2NyaXB0cy9ydW4tanNjLXN0cmVzcy10ZXN0cwppbmRleCBlNjNmM2IwZjBjZjc2 YzM5MmJhN2NjMjg1YTI1OGM4MGE2YmRmMWJkLi4xODI4NjNmNjgwZGU0YjY3NzQxYjZkZTZiZGQ5 MzNjMzFjZjBlMWI1IDEwMDc1NQotLS0gYS9Ub29scy9TY3JpcHRzL3J1bi1qc2Mtc3RyZXNzLXRl c3RzCisrKyBiL1Rvb2xzL1NjcmlwdHMvcnVuLWpzYy1zdHJlc3MtdGVzdHMKQEAgLTI2MzEsMTAg KzI2MzEsMTAgQEAgZGVmIHJ1bkdudVBhcmFsbGVsUnVubmVyKHJlbW90ZUhvc3RzLCBpbnB1dHMs IG9wdGlvbnM9e30pCiAgICAgICAgICAgICAiLS1zbGYiLCBzbGYsCiAgICAgICAgICAgICAiLS10 aW1lb3V0IiwgdGltZW91dC50b19zLAogICAgICAgICAgICAgIi1hIiwgaW5wdXRzLAotICAgICAg ICAgICAgImlmIHRlc3QgLWUgI3skb3V0cHV0RGlyLmJhc2VuYW1lfS8ucnVubmVyOyB0aGVuIGNk ICN7JG91dHB1dERpci5iYXNlbmFtZX0vLnJ1bm5lcjsgZWxzZSBlY2hvICN7UEFSQUxMRUxfUkVN T1RFX1NUQVRFX0xPU1RfTUFSS0VSfTsgZmFsc2U7IGZpICYmICIgKworICAgICAgICAgICAgIlwi aWYgdGVzdCAtZSAjeyRvdXRwdXREaXIuYmFzZW5hbWV9Ly5ydW5uZXI7IHRoZW4gY2QgI3skb3V0 cHV0RGlyLmJhc2VuYW1lfS8ucnVubmVyOyBlbHNlIGVjaG8gI3tQQVJBTExFTF9SRU1PVEVfU1RB VEVfTE9TVF9NQVJLRVJ9OyBmYWxzZTsgZmkgJiYgIiArCiAgICAgICAgICAgICBleHBvcnRCYXNl RW52aXJvbm1lbnRWYXJpYWJsZXMgKwogICAgICAgICAgICAgJGVudlZhcnMuY29sbGVjdCB7IHx2 YXIgfCAiZXhwb3J0ICN7dmFyfSAmJiJ9LmpvaW4oIiIpICsKLSAgICAgICAgICAgICJzaCAiCisg ICAgICAgICAgICAic2ggXCIiCiAgICAgICAgIF0KICAgICAgICAgcnVuQW5kTW9uaXRvckNvbW1h bmRPdXRwdXQoY21kKSB7CiAgICAgICAgICAgICB8IHBpZCwgbGluZSB8Cg== 430072 2021-05-28 16:33:32 -0700 2021-05-28 21:34:20 -0700 Patch bug-226385-20210528163331.patch text/plain 3041 zhifei_fang U3VidmVyc2lvbiBSZXZpc2lvbjogMjc4MjE4CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggM2FkNDBjNTc0NjFiNjJkZDA4ZjZkZWVmZGQxNmYzY2Qw N2MzYWMwMC4uOGVhZTEwZDM5ZmMwNzUwYWNiZWRiMWVkZjhiZGEwMjhkMDIzZTQzNiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEy IEBACisyMDIxLTA1LTI4ICBaaGlmZWkgRmFuZyAgPHpoaWZlaV9mYW5nQGFwcGxlLmNvbT4KKwor ICAgICAgICBbSlNDXSBFc2NhcGUgJCBvbmx5IHdoZW4gcnVuIHdpdGggU1NICisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjYzODUKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFNjcmlwdHMvcnVuLWpzYy1z dHJlc3MtdGVzdHM6CisKIDIwMjEtMDUtMjggIFpoaWZlaSBGYW5nICA8emhpZmVpX2ZhbmdAYXBw bGUuY29tPgogCiAgICAgICAgIFtKU0NdIEZpeCBydW4tanNjLXN0cmVzcy10ZXN0cyBtaXNzaW5n IGVzY2FwZSAkCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3J1bi1qc2Mtc3RyZXNzLXRlc3Rz IGIvVG9vbHMvU2NyaXB0cy9ydW4tanNjLXN0cmVzcy10ZXN0cwppbmRleCBlNjNmM2IwZjBjZjc2 YzM5MmJhN2NjMjg1YTI1OGM4MGE2YmRmMWJkLi5lNjE0MWI1ZTcyNDlhMGQzM2MwMzIyNTkyM2Nl ZTAxNzJkYTVmMGQzIDEwMDc1NQotLS0gYS9Ub29scy9TY3JpcHRzL3J1bi1qc2Mtc3RyZXNzLXRl c3RzCisrKyBiL1Rvb2xzL1NjcmlwdHMvcnVuLWpzYy1zdHJlc3MtdGVzdHMKQEAgLTIxOTcsOSAr MjE5NywxNCBAQCBkZWYgY29weUJ1bmRsZVRvUmVtb3RlKHJlbW90ZUhvc3QpCiAgICAgbXlzeXMo WyJzY3AiLCAiLW8iLCAiTm9Ib3N0QXV0aGVudGljYXRpb25Gb3JMb2NhbGhvc3Q9eWVzIiwgIi1Q IiwgcmVtb3RlSG9zdC5wb3J0LnRvX3MsICgkb3V0cHV0RGlyLmRpcm5hbWUgKyAkdGFyRmlsZU5h bWUpLnRvX3MsICIje3JlbW90ZUhvc3QudXNlcn1AI3tyZW1vdGVIb3N0Lmhvc3R9OiN7cmVtb3Rl SG9zdC5yZW1vdGVEaXJlY3Rvcnl9Il0pCiBlbmQKIAotZGVmIGV4cG9ydEJhc2VFbnZpcm9ubWVu dFZhcmlhYmxlcwotICAgIGR5bGRGcmFtZXdvcmtQYXRoID0gIlxcJChjZCAjeyR0ZXN0aW5nRnJh bWV3b3JrUGF0aC5kaXJuYW1lfTsgcHdkKSIKLSAgICBsZExpYnJhcnlQYXRoID0gIlxcJChjZCAj eyR0ZXN0aW5nRnJhbWV3b3JrUGF0aC5kaXJuYW1lfS8uLjsgcHdkKS8jeyRqc2NQYXRoLmRpcm5h bWV9IgorZGVmIGV4cG9ydEJhc2VFbnZpcm9ubWVudFZhcmlhYmxlcyhlc2NhcGUpCisgICAgaWYg ZXNjYXBlCisgICAgICAgIGR5bGRGcmFtZXdvcmtQYXRoID0gIlxcJChjZCAjeyR0ZXN0aW5nRnJh bWV3b3JrUGF0aC5kaXJuYW1lfTsgcHdkKSIKKyAgICAgICAgbGRMaWJyYXJ5UGF0aCA9ICJcXCQo Y2QgI3skdGVzdGluZ0ZyYW1ld29ya1BhdGguZGlybmFtZX0vLi47IHB3ZCkvI3skanNjUGF0aC5k aXJuYW1lfSIKKyAgICBlbHNlCisgICAgICAgIGR5bGRGcmFtZXdvcmtQYXRoID0gIlwkKGNkICN7 JHRlc3RpbmdGcmFtZXdvcmtQYXRoLmRpcm5hbWV9OyBwd2QpIgorICAgICAgICBsZExpYnJhcnlQ YXRoID0gIlwkKGNkICN7JHRlc3RpbmdGcmFtZXdvcmtQYXRoLmRpcm5hbWV9Ly4uOyBwd2QpLyN7 JGpzY1BhdGguZGlybmFtZX0iCisgICAgZW5kCiAgICAgWwogICAgICAgICAiZXhwb3J0IERZTERf RlJBTUVXT1JLX1BBVEg9I3tkeWxkRnJhbWV3b3JrUGF0aH0gJiYgIiwKICAgICAgICAgImV4cG9y dCBMRF9MSUJSQVJZX1BBVEg9I3tsZExpYnJhcnlQYXRofSAmJiIsCkBAIC0yMjIwLDcgKzIyMjUs NyBAQCBkZWYgcnVuVGVzdFJ1bm5lcihyZW1vdGVJbmRleD0wKQogICAgICAgICByZW1vdGVTY3Jp cHQgKz0gInJtIC1yZiAjeyRvdXRwdXREaXIuYmFzZW5hbWV9ICYmICIKICAgICAgICAgcmVtb3Rl U2NyaXB0ICs9ICJ0YXIgeHpmICN7JHRhckZpbGVOYW1lfSAmJiAiCiAgICAgICAgIHJlbW90ZVNj cmlwdCArPSAiY2QgI3skb3V0cHV0RGlyLmJhc2VuYW1lfS8ucnVubmVyICYmICIKLSAgICAgICAg cmVtb3RlU2NyaXB0ICs9IGV4cG9ydEJhc2VFbnZpcm9ubWVudFZhcmlhYmxlcworICAgICAgICBy ZW1vdGVTY3JpcHQgKz0gZXhwb3J0QmFzZUVudmlyb25tZW50VmFyaWFibGVzKHRydWUpCiAgICAg ICAgICRlbnZWYXJzLmVhY2ggeyB8dmFyfCByZW1vdGVTY3JpcHQgKz0gImV4cG9ydCAiIDw8IHZh ciA8PCAiXG4iIH0KICAgICAgICAgcmVtb3RlU2NyaXB0ICs9ICIje3Rlc3RSdW5uZXJDb21tYW5k KHJlbW90ZUluZGV4KX1cIiIKICAgICAgICAgcnVuQW5kTW9uaXRvclRlc3RSdW5uZXJDb21tYW5k KFsic3NoIiwgIi1vIiwgIk5vSG9zdEF1dGhlbnRpY2F0aW9uRm9yTG9jYWxob3N0PXllcyIsICIt cCIsIHJlbW90ZUhvc3QucG9ydC50b19zLCAiI3tyZW1vdGVIb3N0LnVzZXJ9QCN7cmVtb3RlSG9z dC5ob3N0fSIsIHJlbW90ZVNjcmlwdF0pCkBAIC0yNjMyLDcgKzI2MzcsNyBAQCBkZWYgcnVuR251 UGFyYWxsZWxSdW5uZXIocmVtb3RlSG9zdHMsIGlucHV0cywgb3B0aW9ucz17fSkKICAgICAgICAg ICAgICItLXRpbWVvdXQiLCB0aW1lb3V0LnRvX3MsCiAgICAgICAgICAgICAiLWEiLCBpbnB1dHMs CiAgICAgICAgICAgICAiaWYgdGVzdCAtZSAjeyRvdXRwdXREaXIuYmFzZW5hbWV9Ly5ydW5uZXI7 IHRoZW4gY2QgI3skb3V0cHV0RGlyLmJhc2VuYW1lfS8ucnVubmVyOyBlbHNlIGVjaG8gI3tQQVJB TExFTF9SRU1PVEVfU1RBVEVfTE9TVF9NQVJLRVJ9OyBmYWxzZTsgZmkgJiYgIiArCi0gICAgICAg ICAgICBleHBvcnRCYXNlRW52aXJvbm1lbnRWYXJpYWJsZXMgKworICAgICAgICAgICAgZXhwb3J0 QmFzZUVudmlyb25tZW50VmFyaWFibGVzKGZhbHNlKSArCiAgICAgICAgICAgICAkZW52VmFycy5j b2xsZWN0IHsgfHZhciB8ICJleHBvcnQgI3t2YXJ9ICYmIn0uam9pbigiIikgKwogICAgICAgICAg ICAgInNoICIKICAgICAgICAgXQo=