bug 484321 - Sisysphus - JavaScript Tests - support timeout and crash exclusion patterns.
authorBob Clary <bclary@bclary.com>
Thu, 19 Mar 2009 21:47:08 -0700
changeset 26510 3593cf467e6c56f311ff05954b1e07ee02ef2806
parent 26398 01f2d0726219b8b2da94917fb2051179d8b628f3
child 26511 a75df88d280b0503f94c946128d457910a9f6d13
push id6115
push userrsayre@mozilla.com
push dateTue, 24 Mar 2009 17:50:03 +0000
treeherdermozilla-central@4a34c6235bb7 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs484321
milestone1.9.2a1pre
bug 484321 - Sisysphus - JavaScript Tests - support timeout and crash exclusion patterns.
js/tests/test.sh
--- a/js/tests/test.sh
+++ b/js/tests/test.sh
@@ -368,25 +368,23 @@ else
     repo=`basename $TEST_MOZILLA_HG`
 fi
 debug "repo=$repo"
 
 pattern="TEST_BRANCH=($branch|[.][*]), TEST_REPO=($repo|[.][*]), TEST_BUILDTYPE=($buildtype|[.][*]), TEST_TYPE=($testtype|[.][*]), TEST_OS=($OSID|[.][*]), TEST_KERNEL=($TEST_KERNEL|[.][*]), TEST_PROCESSORTYPE=($TEST_PROCESSORTYPE|[.][*]), TEST_MEMORY=($TEST_MEMORY|[.][*]),"
 
 if [[ -z "$timeouts" ]]; then
     echo "# exclude tests that time out" >> $excludetestsfile
-#    echo "$pattern .*TEST_EXITSTATUS=TIMED OUT," >> $excludetestsfile
-    egrep "$pattern .*TEST_EXITSTATUS=TIMED OUT," failures.txt | \
+    egrep "$pattern .*TEST_EXITSTATUS=[^,]*TIMED OUT[^,]*," failures.txt | \
         sed 's/.*TEST_ID=\([^,]*\),.*/\1/' | sort -u >> $excludetestsfile
 fi
 
 if [[ -z "$crashes" ]]; then
     echo "# exclude tests that crash" >> $excludetestsfile
-#    echo "$pattern .*TEST_EXITSTATUS=(CRASHED|ABNORMAL)" >> $excludetestsfile
-    egrep "$pattern .*TEST_EXITSTATUS=(CRASHED|ABNORMAL)" failures.txt  | \
+    egrep "$pattern .*TEST_EXITSTATUS=[^,]*(CRASHED|ABNORMAL)[^,]*" failures.txt  | \
         sed 's/.*TEST_ID=\([^,]*\),.*/\1/' | sort -u >> $excludetestsfile
 
 fi
 
 cat $includetestsfile | sed 's|^|include: |'
 cat $excludetestsfile | sed 's|^|exclude: |'
 
 case $testtype in