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

Unified Diff: tests/common.sh

Issue 2845001: Rework the vboot_reference make system. (Closed) Base URL: ssh://git@chromiumos-git/vboot_reference.git
Patch Set: Rework the vboot_reference make system. Created 10 years, 6 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 | « tests/Makefile ('k') | tests/gen_test_keys.sh » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tests/common.sh
diff --git a/tests/common.sh b/tests/common.sh
index 6afcd7765a0cd441e2c07b065c98ec6704b654ea..1e2ca03fe791b061d8492e49b8deca49bdb990b9 100755
--- a/tests/common.sh
+++ b/tests/common.sh
@@ -5,7 +5,7 @@
# found in the LICENSE file.
# Determine script directory.
-if [[ $0 == '/'* ]];
+if [[ $0 == '/'* ]];
then
SCRIPT_DIR="`dirname $0`"
elif [[ $0 == './'* ]];
@@ -15,10 +15,17 @@ else
SCRIPT_DIR="`pwd`"/"`dirname $0`"
fi
-UTIL_DIR=`dirname ${SCRIPT_DIR}`/utility
-TEST_DIR=${SCRIPT_DIR}
+ROOT_DIR="$(dirname ${SCRIPT_DIR})"
+BUILD_DIR="${ROOT_DIR}/build"
+UTIL_DIR="${BUILD_DIR}/utility"
+TEST_DIR="${BUILD_DIR}/tests"
TESTKEY_DIR=${SCRIPT_DIR}/testkeys
TESTCASE_DIR=${SCRIPT_DIR}/testcases
+TESTKEY_SCRATCH_DIR=${TEST_DIR}/testkeys
+
+if [ ! -d ${TESTKEY_SCRATCH_DIR} ]; then
+ mkdir ${TESTKEY_SCRATCH_DIR}
+fi
# Color output encodings.
COL_RED='\E[31;1m'
« no previous file with comments | « tests/Makefile ('k') | tests/gen_test_keys.sh » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698