commit efbf6ac52d1d568ac1f7438a8635fa2e4a792be1
author David James <davidjames@chromium.org> Mon May 30 09:48:05 2011 -0700
committer David James <davidjames@chromium.org> Mon May 30 10:00:29 2011 -0700
tree f8dfe58d750d65d49ac3759155ee2f78885fa0e2
parent 90fdaab9cbe716846c51f9d393339420ff1f0d41

Fix typo breaking cros_run_unit_tests when default board isn't set.

FLAGS_board should only be relied upon after the arguments have been
parsed.

BUG=chromium-os:15853
TEST=Verified that emerge happens on board as it should instead of on
     host.

Change-Id: I40bd48ca769e3710d812bb50dec17346caefa92e
Reviewed-on: http://gerrit.chromium.org/gerrit/1806
Tested-by: David James <davidjames@chromium.org>
Reviewed-by: Jon Kliegman <kliegs@chromium.org>

cros_run_unit_tests

diff --git a/cros_run_unit_tests b/cros_run_unit_tests
index dfaf355..8952223 100755
--- a/cros_run_unit_tests
+++ b/cros_run_unit_tests
@@ -34,13 +34,6 @@
 # List of packages with no unit tests.
 NO_UNITTESTS=""
 
-EMERGE_CMD="emerge"
-EMERGE_BOARD_CMD="emerge-${FLAGS_board}"
-if [[ "${FLAGS_fast}" -eq "${FLAGS_TRUE}" ]]; then
-  EMERGE_CMD="${GCLIENT_ROOT}/chromite/bin/parallel_emerge"
-  EMERGE_BOARD_CMD="${EMERGE_CMD} --board=${FLAGS_board}"
-fi
-
 function check_src_test() {
   egrep '^src_test()' "${1}" > /dev/null
 }
@@ -55,6 +48,13 @@
 
 [ -z "${FLAGS_board}" ] && die "--board required"
 
+EMERGE_CMD="emerge"
+EMERGE_BOARD_CMD="emerge-${FLAGS_board}"
+if [[ "${FLAGS_fast}" -eq "${FLAGS_TRUE}" ]]; then
+  EMERGE_CMD="${GCLIENT_ROOT}/chromite/bin/parallel_emerge"
+  EMERGE_BOARD_CMD="${EMERGE_CMD} --board=${FLAGS_board}"
+fi
+
 # Create package list from package file and list of packages.
 if [ -n "${FLAGS_package_file}" ]; then
   if [ -f "${FLAGS_package_file}" ]; then