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

Unified Diff: mod_for_factory_scripts/500populateQualDbs

Issue 3290021: Reflect the change of QualDbs location moved. (Closed) Base URL: http://git.chromium.org/git/crosutils.git
Patch Set: fix typo Created 10 years, 3 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mod_for_factory_scripts/500populateQualDbs
diff --git a/mod_for_factory_scripts/500populateQualDbs b/mod_for_factory_scripts/500populateQualDbs
index 646f36c6d278566bb1972bc1ceb4042fc46d1bea..fff9a05642290e05285b1fb554a9cc351d828fc0 100755
--- a/mod_for_factory_scripts/500populateQualDbs
+++ b/mod_for_factory_scripts/500populateQualDbs
@@ -8,22 +8,14 @@ TEST_DIR="${ROOT_FS_DIR}/usr/local/autotest/site_tests/hardware_Components"
pushd ${TEST_DIR} 1> /dev/null
-if [ -z ${QUALDB} ]; then
- # If QUALDB not specified, check the existence of the qualified components
- # belonging to the board.
- QUALDB="qualified_components_${BOARD}*"
- FIRST_QUALDB=$(ls $QUALDB 2> /dev/null | head -1)
- if [ ! -z ${FIRST_QUALDB} ]; then
- # Remove qualified components belonging to other boards
- ls qualified_components* 2> /dev/null | grep -v \
- qualified_components_${BOARD} | xargs rm -f
- else
- echo "No qualified component file found at: ${QUALDB}"
- fi
-else
- rm -f qualified_components*
- echo "Copying ${QUALDB} to the image."
- cp -f ${QUALDB} ${TEST_DIR}/
+# Remove the DB directories belonging to other boards.
+KEEPDB="data_${BOARD}"
+ls -d data_* 2> /dev/null | grep -v ${KEEPDB} | xargs rm -fr
+
+# Ensure there is DB directory in x86-agz and x86-mario.
+if [ ! -d ${KEEPDB} -a \
+ \( "${BOARD}" = "x86-agz" -o "${BOARD}" = "x86-mario" \) ]; then
+ echo "No component DB directory found at: ${KEEPDB}"
fi
popd 1> /dev/null
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698