Modified: trunk/Tools/ChangeLog (175441 => 175442)
--- trunk/Tools/ChangeLog 2014-11-01 00:12:51 UTC (rev 175441)
+++ trunk/Tools/ChangeLog 2014-11-01 00:23:29 UTC (rev 175442)
@@ -1,3 +1,15 @@
+2014-10-31 Michael Saboff <msab...@apple.com>
+
+ No way to specify target os or architecture when using the --no-copy option with run-jsc-stress-tests
+ https://bugs.webkit.org/show_bug.cgi?id=138268
+
+ Reviewed by Andreas Kling.
+
+ Added a --arch and --os option to set or override the values that are
+ normally computed based on examining the _javascript_Core we want to test.
+
+ * Scripts/run-jsc-stress-tests:
+
2014-10-31 Dan Bernstein <m...@apple.com>
llvmForJSC build emits a linker warning that it can't find usr/local/LLVMForJavaScriptCore/lib under the build directory
Modified: trunk/Tools/Scripts/run-jsc-stress-tests (175441 => 175442)
--- trunk/Tools/Scripts/run-jsc-stress-tests 2014-11-01 00:12:51 UTC (rev 175441)
+++ trunk/Tools/Scripts/run-jsc-stress-tests 2014-11-01 00:23:29 UTC (rev 175442)
@@ -114,7 +114,10 @@
$remoteHost = nil
$remotePort = nil
$remoteDirectory = nil
+$architecture = nil
+$hostOS = nil
+
def usage
puts "run-jsc-stress-tests -j <shell path> <collections path> [<collections path> ...]"
puts
@@ -128,6 +131,10 @@
puts "--verbose (-v) Print more things while running."
puts "--run-bundle Runs a bundle previously created by run-jsc-stress-tests."
puts "--tarball [fileName] Creates a tarball of the final bundle. Use name if supplied for tar file."
+ puts "--arch Specify architecture instead of determining from _javascript_Core build."
+ puts " e.g. x86, x86_64, arm."
+ puts "--os Specify os instead of determining from _javascript_Core build."
+ puts " e.g. darwin, linux & windows."
puts "--shell-runner Uses the shell-based test runner instead of the default make-based runner."
puts " In general the shell runner is slower than the make runner."
puts "--remote Specify a remote host on which to run tests."
@@ -147,6 +154,8 @@
['--run-bundle', GetoptLong::REQUIRED_ARGUMENT],
['--tarball', GetoptLong::OPTIONAL_ARGUMENT],
['--force-vm-copy', GetoptLong::NO_ARGUMENT],
+ ['--arch', GetoptLong::REQUIRED_ARGUMENT],
+ ['--os', GetoptLong::REQUIRED_ARGUMENT],
['--shell-runner', GetoptLong::NO_ARGUMENT],
['--remote', GetoptLong::REQUIRED_ARGUMENT],
['--child-processes', '-c', GetoptLong::REQUIRED_ARGUMENT],
@@ -186,6 +195,10 @@
$remoteUser, $remoteHost, $remotePort = uri.user, uri.host, uri.port
when '--child-processes'
$numProcessors = arg.to_i
+ when '--arch'
+ $architecture = arg
+ when '--os'
+ $hostOS = arg
end
}
@@ -257,8 +270,8 @@
end
end
-$architecture = determineArchitecture
-$hostOS = determineOS
+$architecture = determineArchitecture unless $architecture
+$hostOS = determineOS unless $hostOS
$numFailures = 0
