commit f451e5b9bb1b7cad1514d78bf0508998b0494b9c
author Dale Curtis <dalecurtis@chromium.org> Fri Oct 28 16:58:40 2011 -0700
committer Dale Curtis <dalecurtis@chromium.org> Mon Oct 31 09:42:37 2011 -0700
tree 035babce4b3449d5a2c50e8363e6c4238874b051
parent 53dd5c140bba266e1f3c92a884d8b145d517a9b5

Fix issue with server tests and new combined controls.

Client and server control files for combined jobs are subtly different.

BUG=chromium-os:22271
TEST=Ran run_remote_tests.

Change-Id: I91dede0d0d35848d058991f65bf9ed55f2d4acc3
Reviewed-on: https://gerrit.chromium.org/gerrit/10881
Reviewed-by: Sam Leffler <sleffler@chromium.org>
Tested-by: Sam Leffler <sleffler@chromium.org>
Commit-Ready: Dale Curtis <dalecurtis@chromium.org>
Tested-by: Dale Curtis <dalecurtis@chromium.org>

run_remote_tests.sh

diff --git a/run_remote_tests.sh b/run_remote_tests.sh
index e634e6a..4e60958 100755
--- a/run_remote_tests.sh
+++ b/run_remote_tests.sh
@@ -211,7 +211,11 @@
   echo "TEST_TYPE=\"${control_type}\"" > ${new_control_file}
   echo "def step_init():" >> ${new_control_file}
   for i in $(seq 1 ${control_file_count}); do
-    echo "    job.next_step('step${i}')" >> ${new_control_file}
+    if [[ "${control_type}" == "client" ]]; then
+      echo "    job.next_step('step${i}')" >> ${new_control_file}
+    else
+      echo "    step${i}()" >> ${new_control_file}
+    fi
   done
 
   local index=1
@@ -224,6 +228,9 @@
     cat ${control_file_path} | sed "s/^/    /" >> ${new_control_file}
     let index=index+1
   done
+  if [[ "${control_type}" == "server" ]]; then
+    echo "step_init()" >> ${new_control_file}
+  fi
   echo "${new_control_file}"
 }