summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorteor <teor@torproject.org>2020-01-14 17:41:44 +1000
committerteor <teor@torproject.org>2020-01-14 17:41:44 +1000
commit8095c785f1929b379ab3341b42cbdb05c7598950 (patch)
treeee856e235cfe81f102635dcfa89f2a4675007a15 /scripts
parent8b46372f264450cb2a8876254c2ba4d0a64eb6dc (diff)
parent7e111d0eaa05d5099d101e82afa1709438fe994e (diff)
downloadtor-8095c785f1929b379ab3341b42cbdb05c7598950.tar.gz
tor-8095c785f1929b379ab3341b42cbdb05c7598950.zip
Merge branch 'maint-0.4.2'
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/maint/practracker/practracker.py2
-rwxr-xr-xscripts/maint/practracker/test_practracker.sh1
2 files changed, 3 insertions, 0 deletions
diff --git a/scripts/maint/practracker/practracker.py b/scripts/maint/practracker/practracker.py
index e1845c43e3..e806aef3b4 100755
--- a/scripts/maint/practracker/practracker.py
+++ b/scripts/maint/practracker/practracker.py
@@ -300,5 +300,7 @@ variable.
if __name__ == '__main__':
if os.environ.get("TOR_DISABLE_PRACTRACKER"):
+ print("TOR_DISABLE_PRACTRACKER is set, skipping practracker tests.",
+ file=sys.stderr)
sys.exit(0)
main(sys.argv)
diff --git a/scripts/maint/practracker/test_practracker.sh b/scripts/maint/practracker/test_practracker.sh
index 9b107e071d..207a5ceded 100755
--- a/scripts/maint/practracker/test_practracker.sh
+++ b/scripts/maint/practracker/test_practracker.sh
@@ -1,6 +1,7 @@
#!/bin/sh
umask 077
+unset TOR_DISABLE_PRACTRACKER
TMPDIR=""
clean () {