diff options
| author | Randall Spangler <rspangler@chromium.org> | 2013-01-15 16:16:43 -0800 |
|---|---|---|
| committer | ChromeBot <chrome-bot@google.com> | 2013-01-16 11:22:38 -0800 |
| commit | 844bce57471153664c78993dab453e87891bb969 (patch) | |
| tree | e7c172c7903ef4e389f76bac4fda6cbac79980b3 /tests | |
| parent | 43949662d8f4738afa3c8b641e7a2d198a658138 (diff) | |
| download | vboot-844bce57471153664c78993dab453e87891bb969.tar.gz | |
Run some tests under qemu when cross-compiling
BUG=chromium-os:26317
BRANCH=none
TEST=manual
sudo FEATURES=test emerge vboot_reference
FEATURES=test emerge-link vboot_reference chromeos-u-boot chromeos-installer
FEATURES=test emerge-daisy vboot_reference chromeos-u-boot chromeos-installer
make && make runtests (both inside and outside chroot)
Change-Id: Ie829e375736ce0df46ddd5a3345efb0ca7e33aba
Signed-off-by: Randall Spangler <rspangler@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/41317
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/common.sh | 4 | ||||
| -rwxr-xr-x | tests/gen_fuzz_test_cases.sh | 2 | ||||
| -rwxr-xr-x | tests/gen_test_keys.sh | 6 |
3 files changed, 5 insertions, 7 deletions
diff --git a/tests/common.sh b/tests/common.sh index 5145004b..43cdf6d2 100755 --- a/tests/common.sh +++ b/tests/common.sh @@ -8,7 +8,7 @@ SCRIPT_DIR=$(dirname $(readlink -f "$0")) ROOT_DIR="$(dirname ${SCRIPT_DIR})" -BUILD_DIR="${ROOT_DIR}/build" +BUILD_DIR="${BUILD}" UTIL_DIR="${BUILD_DIR}/utility" TEST_DIR="${BUILD_DIR}/tests" TESTKEY_DIR=${SCRIPT_DIR}/testkeys @@ -16,7 +16,7 @@ TESTCASE_DIR=${SCRIPT_DIR}/testcases TESTKEY_SCRATCH_DIR=${TEST_DIR}/testkeys if [ ! -d ${TESTKEY_SCRATCH_DIR} ]; then - mkdir ${TESTKEY_SCRATCH_DIR} + mkdir -p ${TESTKEY_SCRATCH_DIR} fi # Color output encodings. diff --git a/tests/gen_fuzz_test_cases.sh b/tests/gen_fuzz_test_cases.sh index fe299616..13d605b2 100755 --- a/tests/gen_fuzz_test_cases.sh +++ b/tests/gen_fuzz_test_cases.sh @@ -13,7 +13,7 @@ set -e # Use a different directory for fuzzing test cases. TESTKEY_DIR=${TESTKEY_DIR:-$(realpath ${SCRIPT_DIR}/../tests/testkeys)} -TESTCASE_DIR="$(realpath ${SCRIPT_DIR}/../build)"/fuzz_testcases +TESTCASE_DIR=${BUILD_DIR}/fuzz_testcases TEST_IMAGE_FILE=${TESTCASE_DIR}/testimage TEST_IMAGE_SIZE=500000 TEST_BOOTLOADER_FILE=${TESTCASE_DIR}/testbootloader diff --git a/tests/gen_test_keys.sh b/tests/gen_test_keys.sh index 11545d22..fff5ec75 100755 --- a/tests/gen_test_keys.sh +++ b/tests/gen_test_keys.sh @@ -11,8 +11,6 @@ set -e -PATH="$(dirname "$0")/../build/utility:${PATH}" - sha_types=( 1 256 512 ) # Generate RSA test keys of various lengths. @@ -40,14 +38,14 @@ function generate_keys { do alg=$((${key_index} * 3 + ${alg_index})) # wrap the public key - vbutil_key \ + ${UTIL_DIR}/vbutil_key \ --pack "${key_base}.sha${sha_type}.vbpubk" \ --key "${key_base}.keyb" \ --version 1 \ --algorithm ${alg} # wrap the private key - vbutil_key \ + ${UTIL_DIR}/vbutil_key \ --pack "${key_base}.sha${sha_type}.vbprivk" \ --key "${key_base}.pem" \ --algorithm ${alg} |