commit ccf1eb3164a48de042dfdd8712f4b788bfefdc49 Author: Nick Mathewson nickm@torproject.org Date: Sat Jun 16 13:08:40 2018 -0400

Fix a bug in my fix for #26258

The fix here is use a different bourne shell subsitution for CARGO_ONLINE, so that an empty string counts as set. --- src/test/test_rust.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/test_rust.sh b/src/test/test_rust.sh index 8e8d29b89..95ffc2e65 100755 --- a/src/test/test_rust.sh +++ b/src/test/test_rust.sh @@ -9,7 +9,7 @@ for cargo_toml_dir in "${abs_top_srcdir:-../../..}"/src/rust/*; do cd "${cargo_toml_dir}" && \ CARGO_TARGET_DIR="${abs_top_builddir:-../../..}/src/rust/target" \ CARGO_HOME="${abs_top_builddir:-../../..}/src/rust" \ - "${CARGO:-cargo}" test --all-features ${CARGO_ONLINE:-"--frozen"} \ + "${CARGO:-cargo}" test --all-features ${CARGO_ONLINE-"--frozen"} \ ${EXTRA_CARGO_OPTIONS} \ --manifest-path "${cargo_toml_dir}/Cargo.toml" || exitcode=1 fi