Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(636)

Side by Side Diff: src/scripts/build_autotest.sh

Issue 1217005: fix autotest scripts for board variants (Closed)
Patch Set: Created 10 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « src/scripts/autotest_lib.sh ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 #!/bin/bash 1 #!/bin/bash
2 2
3 # Copyright (c) 2009 The Chromium OS Authors. All rights reserved. 3 # Copyright (c) 2009 The Chromium OS Authors. All rights reserved.
4 # Use of this source code is governed by a BSD-style license that can be 4 # Use of this source code is governed by a BSD-style license that can be
5 # found in the LICENSE file. 5 # found in the LICENSE file.
6 6
7 # This script makes autotest client tests inside a chroot environment. The idea 7 # This script makes autotest client tests inside a chroot environment. The idea
8 # is to compile any platform-dependent autotest client tests in the build 8 # is to compile any platform-dependent autotest client tests in the build
9 # environment, since client systems under test lack the proper toolchain. 9 # environment, since client systems under test lack the proper toolchain.
10 # 10 #
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 CLIENT_TEST_PATH="../third_party/autotest/files/client/site_tests" 45 CLIENT_TEST_PATH="../third_party/autotest/files/client/site_tests"
46 for SITE_TEST in ${CLIENT_TEST_PATH}/* 46 for SITE_TEST in ${CLIENT_TEST_PATH}/*
47 do 47 do
48 if [ -d ${SITE_TEST} ] 48 if [ -d ${SITE_TEST} ]
49 then 49 then
50 ALL_TESTS="${ALL_TESTS},${SITE_TEST##${CLIENT_TEST_PATH}/}" 50 ALL_TESTS="${ALL_TESTS},${SITE_TEST##${CLIENT_TEST_PATH}/}"
51 fi 51 fi
52 done 52 done
53 53
54 # Load the overlay specific blacklist and remove any matching tests. 54 # Load the overlay specific blacklist and remove any matching tests.
55 PRIMARY_BOARD_OVERLAY="${SRC_ROOT}/overlays/overlay-${FLAGS_board}" 55 BOARD_BASENAME=$(echo "${FLAGS_board}" |cut -d '_' -f 1)
56 PRIMARY_BOARD_OVERLAY="${SRC_ROOT}/overlays/overlay-${BOARD_BASENAME}"
56 BLACKLIST_FILE="${PRIMARY_BOARD_OVERLAY}/autotest-blacklist" 57 BLACKLIST_FILE="${PRIMARY_BOARD_OVERLAY}/autotest-blacklist"
57 if [ -r "${BLACKLIST_FILE}" ] 58 if [ -r "${BLACKLIST_FILE}" ]
58 then 59 then
59 BLACKLISTED_TESTS=$(cat ${BLACKLIST_FILE}) 60 BLACKLISTED_TESTS=$(cat ${BLACKLIST_FILE})
60 61
61 for TEST in ${BLACKLISTED_TESTS} 62 for TEST in ${BLACKLISTED_TESTS}
62 do 63 do
63 ALL_TESTS=${ALL_TESTS/#${TEST},/} # match first test (test,...) 64 ALL_TESTS=${ALL_TESTS/#${TEST},/} # match first test (test,...)
64 ALL_TESTS=${ALL_TESTS/,${TEST},/,} # match middle tests (...,test,...) 65 ALL_TESTS=${ALL_TESTS/,${TEST},/,} # match middle tests (...,test,...)
65 ALL_TESTS=${ALL_TESTS/%,${TEST}/} # match last test (...,test) 66 ALL_TESTS=${ALL_TESTS/%,${TEST}/} # match last test (...,test)
(...skipping 22 matching lines...) Expand all
88 fi 89 fi
89 90
90 # Decide on USE flags based on options 91 # Decide on USE flags based on options
91 USE= 92 USE=
92 [ $FLAGS_autox -eq "$FLAGS_FALSE" ] && USE="${USE} -autox" 93 [ $FLAGS_autox -eq "$FLAGS_FALSE" ] && USE="${USE} -autox"
93 [ $FLAGS_buildcheck -eq "$FLAGS_TRUE" ] && USE="${USE} buildcheck" 94 [ $FLAGS_buildcheck -eq "$FLAGS_TRUE" ] && USE="${USE} buildcheck"
94 95
95 GCLIENT_ROOT="${GCLIENT_ROOT}" TEST_LIST=${TEST_LIST} \ 96 GCLIENT_ROOT="${GCLIENT_ROOT}" TEST_LIST=${TEST_LIST} \
96 FEATURES="${FEATURES} -buildpkg" USE="$USE" "emerge-${FLAGS_board}" \ 97 FEATURES="${FEATURES} -buildpkg" USE="$USE" "emerge-${FLAGS_board}" \
97 chromeos-base/autotest ${EMERGE_JOBS} 98 chromeos-base/autotest ${EMERGE_JOBS}
OLDNEW
« no previous file with comments | « src/scripts/autotest_lib.sh ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698