move path var definition higher up

This commit is contained in:
Jean-Paul Calderone 2018-07-06 12:06:38 -04:00
parent da007ef21d
commit 305d16af69

View File

@ -12,6 +12,14 @@ shift || :
# Make sure we can actually write things to this directory.
sudo --user nobody mkdir -p "${ARTIFACTS}"
TOX_JSON="${ARTIFACTS}"/tox-result.json
SUBUNIT1="${ARTIFACTS}"/results.subunit1
SUBUNIT2="${ARTIFACTS}"/results.subunit2
# Use an intermediate directory here because CircleCI extracts some label
# information from its name.
JUNITXML="${ARTIFACTS}"/junit/unittests/results.xml
# Run the test suite as a non-root user. This is the expected usage some
# small areas of the test suite assume non-root privileges (such as unreadable
# files being unreadable).
@ -29,14 +37,6 @@ sudo TAHOE_LAFS_TRIAL_ARGS="--reporter=subunit" \
-e "${TAHOE_LAFS_TOX_ENVIRONMENT}" \
${TAHOE_LAFS_TOX_ARGS}
TOX_JSON="${ARTIFACTS}"/tox-result.json
SUBUNIT1="${ARTIFACTS}"/results.subunit1
SUBUNIT2="${ARTIFACTS}"/results.subunit2
# Use an intermediate directory here because CircleCI extracts some label
# information from its name.
JUNITXML="${ARTIFACTS}"/junit/unittests/results.xml
# Extract the test process output which should be subunit1-format.
/tmp/tests/bin/python -c '
from json import load