diff options
| author | Klaus Aehlig <klaus.aehlig@huawei.com> | 2023-01-20 17:27:49 +0100 |
|---|---|---|
| committer | Klaus Aehlig <klaus.aehlig@huawei.com> | 2023-01-20 17:58:28 +0100 |
| commit | 94f86097fdec6ac28cb8f81dba5572a1824c01eb (patch) | |
| tree | 9e7d538154cc817645a886c94ef67a07482d30a4 | |
| parent | aed7f7937e95339d7b424c401efc51c5c3a7f607 (diff) | |
| download | justbuild-94f86097fdec6ac28cb8f81dba5572a1824c01eb.tar.gz | |
["test/end-to-end/just-mr", "fetch"]: fix destination directory
By default, just-mr fetches to the first existing distribution
directory; by default, the first distribution directory to consider
is ~/.distfiles. If an explicit destination is desired, it should
be specified with the -o option. Fix the invocation of just-mr in
the end-to-end test to use the specified destination; this also makes
local execution of te test hermetic (as was originally intended), even
if the user has a directory ~/.distfiles.
| -rw-r--r-- | test/end-to-end/just-mr/fetch.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/end-to-end/just-mr/fetch.sh b/test/end-to-end/just-mr/fetch.sh index 8bd78929..16c86c7c 100644 --- a/test/end-to-end/just-mr/fetch.sh +++ b/test/end-to-end/just-mr/fetch.sh @@ -59,7 +59,7 @@ rm -rf "${DISTDIR}" mkdir -p "${DISTDIR}" # Ask just-mr to fetch to the empty distdir -"${JUST_MR}" --local-build-root "${LBR}" --distdir "${DISTDIR}" fetch 2>&1 +"${JUST_MR}" --local-build-root "${LBR}" fetch -o "${DISTDIR}" 2>&1 # Verify that the correct file is stored in the distdir test -f "${DISTDIR}/foo-1.2.3.tar" @@ -68,7 +68,7 @@ echo "Foo archive has now content ${newfoocontent}" test "${newfoocontent}" = "${foocontent}" # Verify that fetching accepts distfiles already present -"${JUST_MR}" --local-build-root "${LBR}" --distdir "${DISTDIR}" fetch 2>&1 +"${JUST_MR}" --local-build-root "${LBR}" fetch -o "${DISTDIR}" 2>&1 newfoocontent=$(git hash-object "${DISTDIR}/foo-1.2.3.tar") echo "Foo archive has now content ${newfoocontent}" test "${newfoocontent}" = "${foocontent}" |