From a973d2bdb4c54e545b13ccc36a167a1af62dfee4 Mon Sep 17 00:00:00 2001 From: Darin Petkov Date: Wed, 22 Feb 2012 10:22:52 +0100 Subject: [PATCH] Add checks for blacklisted directories to test_image_content. Also, blacklist /usr/share/locale. Most recently this unused directory crept back into the image after some "sudo" package changes/upgrades. BUG=chromium-os:11820 TEST=build_image dev for x86-alex, tegra2, amd64-generic Change-Id: I0a209a5030a3da3674d3a38faf2367032c6e3423 Reviewed-on: https://gerrit.chromium.org/gerrit/16352 Tested-by: Darin Petkov Reviewed-by: Chris Sosa Commit-Ready: Darin Petkov --- build_library/test_image_content.sh | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/build_library/test_image_content.sh b/build_library/test_image_content.sh index 5c49397b71..2d007ecb7f 100644 --- a/build_library/test_image_content.sh +++ b/build_library/test_image_content.sh @@ -1,4 +1,4 @@ -# Copyright (c) 2011 The Chromium OS Authors. All rights reserved. +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -31,5 +31,15 @@ test_image_content() { returncode=1 fi + local blacklist_dirs=( + "$root/usr/share/locale" + ) + for dir in "${blacklist_dirs[@]}"; do + if [ -d "$dir" ]; then + error "test_image_content: Blacklisted directory found: $dir" + returncode=1 + fi + done + return $returncode }