From 516883ef97047fa259a6a44f770ea3f86b16aede Mon Sep 17 00:00:00 2001
From: Darin Petkov <petkov@chromium.org>
Date: Wed, 24 Mar 2010 13:38:56 -0700
Subject: [PATCH] Disable checks for collisions when doing build_autotest. This
 fixes bad interaction between run_remote_tests.sh and build_autotest.

Review URL: http://codereview.chromium.org/1298001
---
 build_autotest.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/build_autotest.sh b/build_autotest.sh
index d96cd8e333..e3a87bc803 100755
--- a/build_autotest.sh
+++ b/build_autotest.sh
@@ -94,5 +94,6 @@ USE=
 [ $FLAGS_buildcheck -eq "$FLAGS_TRUE" ] && USE="${USE} buildcheck"
 
 GCLIENT_ROOT="${GCLIENT_ROOT}" TEST_LIST=${TEST_LIST} \
-  FEATURES="${FEATURES} -buildpkg" USE="$USE" "emerge-${FLAGS_board}" \
+  FEATURES="${FEATURES} -buildpkg -collision-protect" \
+  USE="$USE" "emerge-${FLAGS_board}" \
   chromeos-base/autotest ${EMERGE_JOBS}