diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-06-16 13:08:40 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-06-16 13:08:40 -0400 |
| commit | ccf1eb3164a48de042dfdd8712f4b788bfefdc49 (patch) | |
| tree | b212cacd7d705d09be7841a7edb60f79742405af | |
| parent | 71065201dd6dcaf08238a2d09a604dfcdb4aa271 (diff) | |
| download | tor-ccf1eb3164a48de042dfdd8712f4b788bfefdc49.tar.gz tor-ccf1eb3164a48de042dfdd8712f4b788bfefdc49.zip | |
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.
| -rwxr-xr-x | src/test/test_rust.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/test/test_rust.sh b/src/test/test_rust.sh index 8e8d29b895..95ffc2e659 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 |