mirror of
https://github.com/flatcar/scripts.git
synced 2025-08-08 13:36:58 +02:00
Moved running unit tests to occur after building Chrome browser in sync_build_test.sh.
Also added back check to test whether --nounittest is passed in. Review URL: http://codereview.chromium.org/3031056
This commit is contained in:
parent
0d11563bfd
commit
cbf5b86dcb
@ -533,11 +533,6 @@ function main() {
|
||||
./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
|
||||
@ -546,6 +541,12 @@ function main() {
|
||||
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
|
||||
|
Loading…
Reference in New Issue
Block a user