From 5fe640d1ea053910b9abd1d49b23a49ae87ac4bf Mon Sep 17 00:00:00 2001
From: "bclary%bclary.com"
 <bclary%bclary.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Mon, 14 Jan 2008 19:07:01 +0000
Subject: [PATCH] Sisyphus|JavaScript Tests - fix runtests.sh -e extra argument
 processing, bug 412317, not part of the build

git-svn-id: svn://10.0.0.236/trunk@243069 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/js/tests/runtests.sh | 23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/mozilla/js/tests/runtests.sh b/mozilla/js/tests/runtests.sh
index 672f775d5c3..4256d9e08cc 100755
--- a/mozilla/js/tests/runtests.sh
+++ b/mozilla/js/tests/runtests.sh
@@ -138,19 +138,12 @@ export testlogfile
 # exit code, we must pipe stderr from tester.sh to stdout and then
 # look into the testlogfilelist for the error
 
-if [[ -z "$extra" ]]; then
-    tester.sh -t $TEST_JSDIR/test.sh  $verboseflag "$products" "$branches" "$buildtypes" 2>&1 | tee -a $testlogfilelist
-    if grep -q 'test-setup.sh failed' $testlogfilelist; then
-        error "runtests.sh: terminating due to error"
-    fi
-    testlogfiles="`grep '^log:' $testlogfilelist|sed 's|^log: ||'`"
-else
-    tester.sh -t $TEST_JSDIR/test.sh  $verboseflag "$products" "$branches" "$extra" "$buildtypes" 2>&1 | tee -a $testlogfilelist
-    if grep -q 'test-setup.sh failed' $testlogfilelist; then
-        error "runtests.sh: terminating due to error"
-    fi
-    testlogfiles="`grep '^log:' $testlogfilelist|sed 's|^log: ||'`"
+branchesextra=`combo.sh -d - "$branches" "$extra"`
+tester.sh -t $TEST_JSDIR/test.sh  $verboseflag "$products" "$branchesextra" "$buildtypes" 2>&1 | tee -a $testlogfilelist
+if grep -q 'test-setup.sh failed' $testlogfilelist; then
+    error "runtests.sh: terminating due to error"
 fi
+testlogfiles="`grep '^log:' $testlogfilelist|sed 's|^log: ||'`"
 
 rm $testlogfilelist
 
@@ -184,9 +177,9 @@ for testlogfile in $testlogfiles; do
         *) error "unknown buildtype in logfile $testlogfile";;
     esac
     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.8.0*) branch=1.8.0;;
+        *,1.8.1*) branch=1.8.1;;
+        *,1.9.0*) branch=1.9.0;;
         *) error "unknown branch in logfile $testlogfile";;
     esac
     outputprefix=$testlogfile