aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Gaston <jeffrygaston@google.com>2017-06-28 15:10:11 -0700
committerJeff Gaston <jeffrygaston@google.com>2017-09-12 17:58:10 -0700
commit5f332c83aeca7d8b8a71cd5e2699feeb34e5e564 (patch)
tree7041a48ea220b07e6c21eb5996775fcdf0eeb14a
parent1ff2efa021f35f398882b0fdea34d2a6923e4f29 (diff)
downloadplatform_build_blueprint-5f332c83aeca7d8b8a71cd5e2699feeb34e5e564.tar.gz
platform_build_blueprint-5f332c83aeca7d8b8a71cd5e2699feeb34e5e564.tar.bz2
platform_build_blueprint-5f332c83aeca7d8b8a71cd5e2699feeb34e5e564.zip
Move generated Travis test dirs outside the tree
This should prevent the running of Travis tests from causing a filesystem loop src.test/test_tree/blueprint -> ../.. Bug: 63100441 Test: NINJA=... ./tests/test_tree_tests.sh; stat src.test 2>/dev/null \ && echo "src.test should not exist" Change-Id: Ie01fe8999c738dca166e3fabde9d9391f6b70210
-rwxr-xr-xtests/test_tree_tests.sh26
1 files changed, 16 insertions, 10 deletions
diff --git a/tests/test_tree_tests.sh b/tests/test_tree_tests.sh
index dd545c7..b393d30 100755
--- a/tests/test_tree_tests.sh
+++ b/tests/test_tree_tests.sh
@@ -5,19 +5,25 @@ function mtime() {
}
# Go to top of blueprint tree
-TOP=$(dirname ${BASH_SOURCE[0]})/..
-cd ${TOP}
+cd $(dirname ${BASH_SOURCE[0]})/..
+TOP=${PWD}
-rm -rf out.test
-mkdir out.test
+export TEMPDIR=$(mktemp -d -t blueprint.test.XXX)
-rm -rf src.test
-mkdir src.test
-cp -r tests/test_tree src.test/test_tree
-ln -s ../.. src.test/test_tree/blueprint
+function cleanup() {
+ cd "${TOP}"
+ rm -rf "${TEMPDIR}"
+}
+trap cleanup EXIT
+
+export OUTDIR="${TEMPDIR}/out"
+mkdir "${OUTDIR}"
+
+export SRCDIR="${TEMPDIR}/src"
+cp -r tests/test_tree "${SRCDIR}"
+ln -s "${TOP}" "${SRCDIR}/blueprint"
-cd out.test
-export SRCDIR=../src.test/test_tree
+cd "${OUTDIR}"
export BLUEPRINTDIR=${SRCDIR}/blueprint
${SRCDIR}/blueprint/bootstrap.bash $@
./blueprint.bash