From cd24ca2fdb556fe4b1033a66097083b833a5e75f Mon Sep 17 00:00:00 2001 From: "bclary%bclary.com" Date: Thu, 1 May 2008 23:38:30 +0000 Subject: [PATCH] Sisyphus|JavaScript Tests - runtests.sh -I include conflicts with msvc include on Windows git-svn-id: svn://10.0.0.236/trunk@251069 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/js/tests/runtests.sh | 14 ++-- mozilla/js/tests/test-browser.sh | 108 +++++++++++++++---------------- mozilla/js/tests/test-shell.sh | 92 +++++++++++++------------- 3 files changed, 107 insertions(+), 107 deletions(-) diff --git a/mozilla/js/tests/runtests.sh b/mozilla/js/tests/runtests.sh index 6c9e07232dd..d174465c541 100755 --- a/mozilla/js/tests/runtests.sh +++ b/mozilla/js/tests/runtests.sh @@ -67,7 +67,7 @@ usage() { cat <> $includetests + echo "# including $i" >> $includetestsfile if echo $i | grep -q '\.js$'; then - echo $i >> $includetests + echo $i >> $includetestsfile else - cat $i >> $includetests + cat $i >> $includetestsfile fi elif [[ -d "$i" ]]; then - find $i -name '*.js' -print | egrep -v '(shell|browser|template|jsref|userhook.*|\.#.*)\.js' | sed 's/^\.\///' | sort >> $includetests + find $i -name '*.js' -print | egrep -v '(shell|browser|template|jsref|userhook.*|\.#.*)\.js' | sed 's/^\.\///' | sort >> $includetestsfile fi done -excludetests="excluded-$branch-browser-$buildtype.tests" -rm -f $excludetests -touch $excludetests +excludetestsfile="excluded-$branch-browser-$buildtype.tests" +rm -f $excludetestsfile +touch $excludetestsfile -if [[ -z "$exclude" ]]; then - exclude="spidermonkey-n-$branch.tests performance-$branch.tests" +if [[ -z "$excludetests" ]]; then + excludetests="spidermonkey-n-$branch.tests performance-$branch.tests" fi -for e in $exclude; do +for e in $excludetests; do if [[ -f "$e" ]]; then - echo "# excluding $e" >> $excludetests + echo "# excluding $e" >> $excludetestsfile if echo $e | grep -q '\.js$'; then - echo $e >> $excludetests + echo $e >> $excludetestsfile else - cat $e >> $excludetests + cat $e >> $excludetestsfile fi elif [[ -d "$e" ]]; then - find $e -name '*.js' -print | egrep -v '(shell|browser|template|jsref|userhook.*|\.#.*)\.js' | sed 's/^\.\///' | sort >> $excludetests + find $e -name '*.js' -print | egrep -v '(shell|browser|template|jsref|userhook.*|\.#.*)\.js' | sed 's/^\.\///' | sort >> $excludetestsfile fi done @@ -235,13 +235,13 @@ case "$OSID" in esac if [[ -z "$timeouts" ]]; then - echo "# exclude tests that time out" >> $excludetests + echo "# exclude tests that time out" >> $excludetestsfile egrep "TEST_BRANCH=([^,]*$branch[^,]*|[.][*]), TEST_RESULT=FAILED, TEST_BUILDTYPE=([^,]*$buildtype[^,]*|[.][*]), TEST_TYPE=([^,]*browser[^,]*|[.][*]), TEST_OS=([^,]*$OSID[^,]*|[.][*]), .*, TEST_PROCESSORTYPE=([^,]*$arch[^,]*|[.][*]), TEST_KERNEL=([^,]*$kernel[^,]*|[.][*]), .*, TEST_DESCRIPTION=.*EXIT STATUS: TIMED OUT" \ - failures.txt | sed 's/TEST_ID=\([^,]*\),.*/\1/' | sort | uniq >> $excludetests + failures.txt | sed 's/TEST_ID=\([^,]*\),.*/\1/' | sort | uniq >> $excludetestsfile fi if [[ -z "$crashes" ]]; then - echo "# exclude tests that crash" >> $excludetests + echo "# exclude tests that crash" >> $excludetestsfile pattern="TEST_BRANCH=([^,]*$branch[^,]*|[.][*]), TEST_RESULT=FAILED, TEST_BUILDTYPE=([^,]*$buildtype[^,]*|[.][*]), TEST_TYPE=([^,]*browser[^,]*|[.][*]), TEST_OS=([^,]*$OSID[^,]*|[.][*]), .*, TEST_PROCESSORTYPE=([^,]*$arch[^,]*|[.][*]), TEST_KERNEL=([^,]*$kernel[^,]*|[.][*]), .*, TEST_DESCRIPTION=.*" case "$buildtype" in opt) @@ -251,7 +251,7 @@ if [[ -z "$crashes" ]]; then pattern="${pattern}(EXIT STATUS: CRASHED|Assertion failure:)" ;; esac - egrep "$pattern" failures.txt | sed 's/TEST_ID=\([^,]*\),.*/\1/' | sort | uniq >> $excludetests + egrep "$pattern" failures.txt | sed 's/TEST_ID=\([^,]*\),.*/\1/' | sort | uniq >> $excludetestsfile fi @@ -269,13 +269,13 @@ cat > $urlhtml < EOF -cat $includetests | while read jsfile +cat $includetestsfile | while read jsfile do if echo $jsfile | grep -q '^#'; then continue fi - if ! grep -q $jsfile $excludetests; then + if ! grep -q $jsfile $excludetestsfile; then result=`echo $jsfile | sed 's/.*js\([0-9]\)_\([0-9]\).*/\1.\2/'` @@ -302,32 +302,32 @@ EOF chmod a+r $urlhtml -cat $includetests | sed 's|^|include: |' -cat $excludetests | sed 's|^|exclude: |' +cat $includetestsfile | sed 's|^|include: |' +cat $excludetestsfile | sed 's|^|exclude: |' if [[ -z "$filesonly" ]]; then if [[ "$restart" == "1" ]]; then cat "$urllist" | while read url; do - edit-talkback.sh -p "$product" -b "$branch" -x "$executablepath" -i "$url" - if time timed_run.py $TEST_JSEACH_TIMEOUT "$url" \ - "$executable" -P "$profilename" \ - -spider -start -quit \ - -uri "$url" \ - -depth 0 -timeout "$TEST_JSEACH_PAGE_TIMEOUT" \ - -hook "http://$TEST_HTTP/$TEST_WWW_JS/userhookeach.js"; then + edit-talkback.sh -p "$product" -b "$branch" -x "$executablepath" -i "$url" + if time timed_run.py $TEST_JSEACH_TIMEOUT "$url" \ + "$executable" -P "$profilename" \ + -spider -start -quit \ + -uri "$url" \ + -depth 0 -timeout "$TEST_JSEACH_PAGE_TIMEOUT" \ + -hook "http://$TEST_HTTP/$TEST_WWW_JS/userhookeach.js"; then true; fi done else - edit-talkback.sh -p "$product" -b "$branch" -x "$executablepath" -i "http://$TEST_HTTP/$TEST_WWW_JS/$urlhtml" - if ! time timed_run.py $TEST_JSALL_TIMEOUT "http://$TEST_HTTP/$TEST_WWW_JS/$urlhtml" \ - "$executable" -P "$profilename" \ - -spider -start -quit \ - -uri "http://$TEST_HTTP/$TEST_WWW_JS/$urlhtml" \ - -depth 1 -timeout "$TEST_JSEACH_PAGE_TIMEOUT" \ - -hook "http://$TEST_HTTP/$TEST_WWW_JS/userhookeach.js"; then + edit-talkback.sh -p "$product" -b "$branch" -x "$executablepath" -i "http://$TEST_HTTP/$TEST_WWW_JS/$urlhtml" + if ! time timed_run.py $TEST_JSALL_TIMEOUT "http://$TEST_HTTP/$TEST_WWW_JS/$urlhtml" \ + "$executable" -P "$profilename" \ + -spider -start -quit \ + -uri "http://$TEST_HTTP/$TEST_WWW_JS/$urlhtml" \ + -depth 1 -timeout "$TEST_JSEACH_PAGE_TIMEOUT" \ + -hook "http://$TEST_HTTP/$TEST_WWW_JS/userhookeach.js"; then error "timed_run.py ended abnormally: $?" $LINENO fi fi diff --git a/mozilla/js/tests/test-shell.sh b/mozilla/js/tests/test-shell.sh index c79c13ed7f8..83b605b8726 100755 --- a/mozilla/js/tests/test-shell.sh +++ b/mozilla/js/tests/test-shell.sh @@ -38,13 +38,13 @@ # ***** END LICENSE BLOCK ***** if [[ -z "$TEST_DIR" ]]; then - cat <> $includetests + echo "# including $i" >> $includetestsfile if echo $i | grep -q '\.js$'; then - echo $i >> $includetests + echo $i >> $includetestsfile else - cat $i >> $includetests + cat $i >> $includetestsfile fi elif [[ -d "$i" ]]; then - find $i -name '*.js' -print | egrep -v '(shell|browser|template|jsref|userhook.*|\.#.*)\.js' | sed 's/^\.\///' | sort >> $includetests + find $i -name '*.js' -print | egrep -v '(shell|browser|template|jsref|userhook.*|\.#.*)\.js' | sed 's/^\.\///' | sort >> $includetestsfile fi done -#excludetests=`mktemp excludetests.XXXXX` -excludetests="excluded-$branch-shell-$buildtype.tests" -rm -f $excludetests -touch $excludetests +#excludetestsfile=`mktemp excludetestsfile.XXXXX` +excludetestsfile="excluded-$branch-shell-$buildtype.tests" +rm -f $excludetestsfile +touch $excludetestsfile -if [[ -z "$exclude" ]]; then - exclude="spidermonkey-n-$branch.tests performance-$branch.tests" +if [[ -z "$excludetests" ]]; then + excludetests="spidermonkey-n-$branch.tests performance-$branch.tests" fi -for e in $exclude; do +for e in $excludetests; do if [[ -f "$e" ]]; then - echo "# excluding $e" >> $excludetests + echo "# excluding $e" >> $excludetestsfile if echo $e | grep -q '\.js$'; then - echo $e >> $excludetests + echo $e >> $excludetestsfile else - cat $e >> $excludetests + cat $e >> $excludetestsfile fi elif [[ -d "$e" ]]; then - find $e -name '*.js' -print | egrep -v '(shell|browser|template|userhook.*|\.#.*).js' | sed 's/^\.\///' | sort >> $excludetests + find $e -name '*.js' -print | egrep -v '(shell|browser|template|userhook.*|\.#.*).js' | sed 's/^\.\///' | sort >> $excludetestsfile fi done @@ -222,13 +222,13 @@ case "$OSID" in esac if [[ -z "$timeouts" ]]; then - echo "# exclude tests that time out" >> $excludetests + echo "# exclude tests that time out" >> $excludetestsfile egrep "TEST_BRANCH=([^,]*$branch[^,]*|[.][*]), TEST_RESULT=FAILED, TEST_BUILDTYPE=([^,]*$buildtype[^,]*|[.][*]), TEST_TYPE=([^,]*shell[^,]*|[.][*]), TEST_OS=([^,]*$OSID[^,]*|[.][*]), .*, TEST_PROCESSORTYPE=([^,]*$arch[^,]*|[.][*]), TEST_KERNEL=([^,]*$kernel[^,]*|[.][*]), .*, TEST_DESCRIPTION=.*EXIT STATUS: TIMED OUT" \ - failures.txt | sed 's/TEST_ID=\([^,]*\),.*/\1/' | sort | uniq >> $excludetests + failures.txt | sed 's/TEST_ID=\([^,]*\),.*/\1/' | sort | uniq >> $excludetestsfile fi if [[ -z "$crashes" ]]; then - echo "# exclude tests that crash" >> $excludetests + echo "# exclude tests that crash" >> $excludetestsfile pattern="TEST_BRANCH=([^,]*$branch[^,]*|[.][*]), TEST_RESULT=FAILED, TEST_BUILDTYPE=([^,]*$buildtype[^,]*|[.][*]), TEST_TYPE=([^,]*shell[^,]*|[.][*]), TEST_OS=([^,]*$OSID[^,]*|[.][*]), .*, TEST_PROCESSORTYPE=([^,]*$arch[^,]*|[.][*]), TEST_KERNEL=([^,]*$kernel[^,]*|[.][*]), .*, TEST_DESCRIPTION=.*" case "$buildtype" in opt) @@ -238,22 +238,22 @@ if [[ -z "$crashes" ]]; then pattern="${pattern}(EXIT STATUS: CRASHED|Assertion failure:)" ;; esac - egrep "$pattern" failures.txt | sed 's/TEST_ID=\([^,]*\),.*/\1/' | sort | uniq >> $excludetests + egrep "$pattern" failures.txt | sed 's/TEST_ID=\([^,]*\),.*/\1/' | sort | uniq >> $excludetestsfile fi -cat $includetests | sed 's|^|include: |' -cat $excludetests | sed 's|^|exclude: |' +cat $includetestsfile | sed 's|^|include: |' +cat $excludetestsfile | sed 's|^|exclude: |' if ! time perl jsDriver.pl \ - -l $includetests \ - -L $excludetests \ - -s $executable \ + -l $includetestsfile \ + -L $excludetestsfile \ + -s $executable \ -e sm$buildtype \ - -o "-S 524288 $gczeal" \ - -R \ - -T $TEST_JSSHELL_TIMEOUT \ - -f /dev/null \ + -o "-S 524288 $gczeal" \ + -R \ + -T $TEST_JSSHELL_TIMEOUT \ + -f /dev/null \ -Q; then error "$product-$branch-$buildtype-$OSID: jsDriver.pl" $LINENO fi