Title: [179343] trunk/Tools
- Revision
- 179343
- Author
- [email protected]
- Date
- 2015-01-29 05:33:51 -0800 (Thu, 29 Jan 2015)
Log Message
Make run-jsc-stress-tests --remote work on Linux too
https://bugs.webkit.org/show_bug.cgi?id=141000
Reviewed by Darin Adler.
* Scripts/jsc-stress-test-helpers/shell-runner.sh: Omit error message of sysctl,
use bash/dash compatible signal names, use Linux/Mac compatible find options,
use bash/dash compatible functions.
* Scripts/run-jsc-stress-tests: Use Linux/Mac compatible find options.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (179342 => 179343)
--- trunk/Tools/ChangeLog 2015-01-29 13:32:25 UTC (rev 179342)
+++ trunk/Tools/ChangeLog 2015-01-29 13:33:51 UTC (rev 179343)
@@ -1,5 +1,17 @@
2015-01-29 Csaba Osztrogonác <[email protected]>
+ Make run-jsc-stress-tests --remote work on Linux too
+ https://bugs.webkit.org/show_bug.cgi?id=141000
+
+ Reviewed by Darin Adler.
+
+ * Scripts/jsc-stress-test-helpers/shell-runner.sh: Omit error message of sysctl,
+ use bash/dash compatible signal names, use Linux/Mac compatible find options,
+ use bash/dash compatible functions.
+ * Scripts/run-jsc-stress-tests: Use Linux/Mac compatible find options.
+
+2015-01-29 Csaba Osztrogonác <[email protected]>
+
[buildbot] Simplify jscore-test buildstep
https://bugs.webkit.org/show_bug.cgi?id=140821
Modified: trunk/Tools/Scripts/jsc-stress-test-helpers/shell-runner.sh (179342 => 179343)
--- trunk/Tools/Scripts/jsc-stress-test-helpers/shell-runner.sh 2015-01-29 13:32:25 UTC (rev 179342)
+++ trunk/Tools/Scripts/jsc-stress-test-helpers/shell-runner.sh 2015-01-29 13:33:51 UTC (rev 179343)
@@ -21,7 +21,7 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-numProcs=`sysctl -n hw.activecpu`
+numProcs=`sysctl -n hw.activecpu 2>/dev/null`
if [ $? -gt 0 ]
then
numProcs=`nproc --all 2>/dev/null`
@@ -36,16 +36,16 @@
tempFile=".temp.txt"
lockDir=".lock_dir"
-trap "kill -9 0" SIGINT SIGHUP SIGTERM
+trap "kill -9 0" INT HUP TERM
echo 0 > ${indexFile}
-find . -name 'test_script_*' -depth 1 > ${testList}
+find . -maxdepth 1 -name 'test_script_*' > ${testList}
-function lock_test_list() {
+lock_test_list() {
until mkdir ${lockDir} 2> /dev/null; do sleep 0; done
}
-function unlock_test_list() {
+unlock_test_list() {
rmdir ${lockDir}
}
Modified: trunk/Tools/Scripts/run-jsc-stress-tests (179342 => 179343)
--- trunk/Tools/Scripts/run-jsc-stress-tests 2015-01-29 13:32:25 UTC (rev 179342)
+++ trunk/Tools/Scripts/run-jsc-stress-tests 2015-01-29 13:33:51 UTC (rev 179343)
@@ -1392,7 +1392,7 @@
raise if $bundle
if $remote
- output = sshRead("cd #{$remoteDirectory}/#{$outputDir.basename}/.runner && find . -name \"test_fail_*\" -depth 1")
+ output = sshRead("cd #{$remoteDirectory}/#{$outputDir.basename}/.runner && find . -maxdepth 1 -name \"test_fail_*\"")
output.split(/\n/).each {
| line |
next unless line =~ /test_fail_/
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
