Index: mozilla-tests/process-logs.sh |
=================================================================== |
--- mozilla-tests/process-logs.sh (revision 43940) |
+++ mozilla-tests/process-logs.sh (working copy) |
@@ -113,13 +113,15 @@ |
case "$testlogfile" in |
*,js,*) testtype=shell;; |
*,firefox,*) testtype=browser;; |
+ *,thunderbird,*) testtype=browser;; |
+ *,fennec,*) testtype=browser;; |
*) error "unknown testtype in logfile $testlogfile" $LINENO;; |
esac |
debug "testtype=$testtype" |
case "$testlogfile" in |
- *,nightly,*) buildtype=nightly;; |
+ *,nightly*) buildtype=nightly;; |
*,opt,*) buildtype=opt;; |
*,debug,*) buildtype=debug;; |
*) error "unknown buildtype in logfile $testlogfile" $LINENO; |
@@ -127,22 +129,11 @@ |
debug "buildtype=$buildtype" |
- case "$testlogfile" in |
- *,1.8.0*) branch=1.8.0;; |
- *,1.8.1*) branch=1.8.1;; |
- *,1.9.0*) branch=1.9.0;; |
- *,1.9.1*) branch=1.9.1;; |
- *) |
- branch=`grep -m 1 '^environment: TEST_BRANCH=' $worktestlogfile | sed 's|.*TEST_BRANCH=\(.*\)|\1|'` |
- if [[ -z "$branch" ]]; then |
- error "unknown branch in logfile $testlogfile" $LINENO |
- fi |
- ;; |
- esac |
+ branch=`echo $testlogfile | sed 's|.*,\([0-9]\.[0-9]*\.[0-9]*\).*|\1|'` |
debug "branch=$branch" |
- repo=`grep -m 1 '^environment: TEST_MOZILLA_HG=' $worktestlogfile | sed 's|.*TEST_MOZILLA_HG=http://hg.mozilla.org/\(.*\)|\1|'` |
+ repo=`grep -m 1 '^environment: TEST_MOZILLA_HG=' $worktestlogfile | sed 's|.*TEST_MOZILLA_HG=http://hg.mozilla.org.*/\([^\/]*\)|\1|'` |
if [[ -z "$repo" ]]; then |
repo=CVS |
fi |
@@ -172,12 +163,16 @@ |
debug "arch=$arch" |
memory=`grep -m 1 '^environment: TEST_MEMORY=' $worktestlogfile | sed 's|.*TEST_MEMORY=\(.*\)|\1|'` |
- speed=`grep -m 1 '^environment: TEST_CPUSPEED=' $worktestlogfile | sed 's|.*TEST_CPUSPEED=\(.*\)|\1|'` |
timezone=`basename $testlogfile | sed 's|^[-0-9]*\([-+]\)\([0-9]\{4,4\}\),.*|\1\2|'` |
- |
debug "timezone=$timezone" |
+ jsoptions=`grep -m 1 '^arguments: javascriptoptions=' $worktestlogfile | sed 's|.*javascriptoptions=\(.*\)|\1|'` |
+ if [[ -z "$jsoptions" ]]; then |
+ jsoptions=none |
+ fi |
+ debug "jsoptions=$jsoptions" |
+ |
outputprefix=$testlogfile |
includetests="included-$branch-$testtype-$buildtype.tests" |
@@ -195,8 +190,8 @@ |
-K "$kernel" \ |
-A "$arch" \ |
-M "$memory" \ |
- -S "$speed" \ |
-z "$timezone" \ |
+ -J "$jsoptions" \ |
-r "$TEST_JSDIR/failures.txt" \ |
-l "$worktestlogfile" \ |
-O "$outputprefix" |