[tor-commits] [tor/release-0.3.2] Fix $abs_top_srcdir in test_rust.sh

nickm at torproject.org nickm at torproject.org
Wed Aug 22 00:04:26 UTC 2018


commit c9ad16ca2a2aff63fc4814c843cd376c76e43095
Author: teor <teor at torproject.org>
Date:   Fri Aug 10 11:22:36 2018 +1000

    Fix $abs_top_srcdir in test_rust.sh
    
    Consistently use ../../.. as a fallback for $abs_top_srcdir in
    test_rust.sh.
    
    Fixes bug 27093; bugfix on 0.3.4.3-alpha.
---
 changes/bug27093      | 3 +++
 src/test/test_rust.sh | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/changes/bug27093 b/changes/bug27093
new file mode 100644
index 000000000..6c097f119
--- /dev/null
+++ b/changes/bug27093
@@ -0,0 +1,3 @@
+  o Minor bugfixes (rust):
+    - Consistently use ../../.. as a fallback for $abs_top_srcdir in
+      test_rust.sh. Fixes bug 27093; bugfix on 0.3.4.3-alpha.
diff --git a/src/test/test_rust.sh b/src/test/test_rust.sh
index 9ad7a698a..2761b612b 100755
--- a/src/test/test_rust.sh
+++ b/src/test/test_rust.sh
@@ -3,7 +3,7 @@
 
 set -e
 
-export LSAN_OPTIONS=suppressions=${abs_top_srcdir}/src/test/rust_supp.txt
+export LSAN_OPTIONS=suppressions=${abs_top_srcdir:-../../..}/src/test/rust_supp.txt
 
 for cargo_toml_dir in "${abs_top_srcdir:-../../..}"/src/rust/*; do
     if [ -e "${cargo_toml_dir}/Cargo.toml" ]; then





More information about the tor-commits mailing list