Moved running unit tests to occur after building Chrome browser in sync_build_test.sh.

sync_build_test.sh

 #!/bin/bash
 
 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # Script to sync your checkout, build a Chromium OS image, and test it all
 # with one command.  Can also check out a new Chromium OS checkout and
 # perform a subset of the above operations.
 #
@@ skipping 515 matching lines @@
     fi
     local build_autotest_param=""
     if [[ ${FLAGS_build_autotest} -eq ${FLAGS_TRUE} ]]; then
       build_autotest_param="--withautotest"
     fi
 
     run_phase_in_chroot "Building packages" \
         ./build_packages "${board_param}" \
         ${jobs_param} ${withdev_param} ${build_autotest_param} \
         ${pkg_param}
-
-    if [[ "${FLAGS_board}" == "x86-generic" ]]; then
-      run_phase_in_chroot "Running unit tests" ./cros_run_unit_tests \
-        ${board_param}
-    fi
   fi
 
   if [[ ${FLAGS_chrome_root} ]]; then
     run_phase_in_chroot "Building Chromium browser" \
       BOARD="${FLAGS_board}" USE="build_tests" FEATURES="-usersandbox" \
       CHROME_ORIGIN=LOCAL_SOURCE emerge-${FLAGS_board} chromeos-chrome
   fi
 
+  if [[ ${FLAGS_unittest} -eq ${FLAGS_TRUE} ]] && [[ "${FLAGS_board}" == \
+    "x86-generic" ]] ; then
+    run_phase_in_chroot "Running unit tests" ./cros_run_unit_tests \
+      ${board_param}
+  fi
+
   if [[ ${FLAGS_master} -eq ${FLAGS_TRUE} ]]; then
     chdir_relative src/scripts
     if [[ -n "${FLAGS_chronos_passwd}" ]]; then
       run_phase_in_chroot "Setting default chronos password" \
       ./enter_chroot.sh "echo '${FLAGS_chronos_passwd}' | \
                         ~/trunk/src/scripts/set_shared_user_password.sh"
     fi
     run_phase_in_chroot "Mastering image" ./build_image \
         "${board_param}" --replace ${withdev_param} \
         ${jobs_param}
@@ skipping 27 matching lines @@
   fi
 
   trap - EXIT
   echo "Successfully used ${FLAGS_top} to:"
   describe_steps
   show_duration
 }
 
 
 main $@