commit 47f879c7fa17b1135fba37c68d4402f428b110bf Author: fh <fh-github@fholzhauer.de> Date: Thu Jul 25 17:50:20 2013 +0200 nettests dir changed --- README.md | 2 +- inputs/README | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 2d931ab..280fe96 100644 --- a/README.md +++ b/README.md @@ -56,7 +56,7 @@ ooniprobe will be installed in `/data/ooniprobe`. ``` cd /data/ooniprobe/ -./bin/ooniprobe nettests/blocking/http_requests.py -f /data/ooniprobe/inputs/input-pack/alexa-top-1k.txt +./bin/ooniprobe data/nettests/blocking/http_requests.py -f /data/ooniprobe/inputs/input-pack/alexa-top-1k.txt ``` ## The easy way to prep your system for running ooniprobe diff --git a/inputs/README b/inputs/README index 2bbc11e..fb3599d 100644 --- a/inputs/README +++ b/inputs/README @@ -3,38 +3,38 @@ the correct functionality of the various OONIProbe tests. # DNS Tamper -./bin/ooniprobe -o dns_tamper_test.yamloo nettests/blocking/dnsconsistency.py -t +./bin/ooniprobe -o dns_tamper_test.yamloo data/nettests/blocking/dnsconsistency.py -t example_inputs/dns_tamper_test_resolvers.txt -f example_inputs/dns_tamper_file.txt less dns_tamper_test.yamloo # Captive Portal -./bin/ooniprobe -o captive_portal_test.yamloo nettests/core/captiveportal.py +./bin/ooniprobe -o captive_portal_test.yamloo data/nettests/core/captiveportal.py less captive_portal_test.yamloo # HTTP Host -./bin/ooniprobe -o http_host.yamloo nettests/manipulation/http_host.py -b http://ooni.nu/test -f example_inputs/http_host_file.txt +./bin/ooniprobe -o http_host.yamloo data/nettests/manipulation/http_host.py -b http://ooni.nu/test -f example_inputs/http_host_file.txt less http_host.yamloo # Keyword filtering -./bin/ooniprobe -o keyword_filtering.yamloo nettests/core/keyword_filtering.py -b http://ooni.nu/test/ -f test_inputs/keyword_filtering_file.txt +./bin/ooniprobe -o keyword_filtering.yamloo data/nettests/core/keyword_filtering.py -b http://ooni.nu/test/ -f test_inputs/keyword_filtering_file.txt less keyword_filtering.yamloo # URL List -./bin/ooniprobe -o url_lists.yamloo nettests/core/url_list.py -f test_inputs/url_lists_file.txt +./bin/ooniprobe -o url_lists.yamloo data/nettests/core/url_list.py -f test_inputs/url_lists_file.txt less url_lists.yamloo # Squid transparent proxy -./bin/ooniprobe -o squid.yamloo nettests/core/squid.py +./bin/ooniprobe -o squid.yamloo data/nettests/core/squid.py less squid.yamloo