diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-07-05 17:05:54 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-07-05 17:15:50 -0400 |
| commit | f720a5a439b6fd3e9a283891c15f41f93532d81c (patch) | |
| tree | f22d2493244a7db14ae125fc18009f19708f4ea5 /scripts | |
| parent | 5f51c2de8bf27c1c5eba8c27d32273284d41a3d7 (diff) | |
| download | tor-f720a5a439b6fd3e9a283891c15f41f93532d81c.tar.gz tor-f720a5a439b6fd3e9a283891c15f41f93532d81c.zip | |
Fix everything that previously referred to src/or
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/maint/fallback.whitelist | 3 | ||||
| -rwxr-xr-x | scripts/maint/updateFallbackDirs.py | 8 | ||||
| -rwxr-xr-x | scripts/test/coverage | 2 |
3 files changed, 7 insertions, 6 deletions
diff --git a/scripts/maint/fallback.whitelist b/scripts/maint/fallback.whitelist index e9158e1280..79551948c6 100644 --- a/scripts/maint/fallback.whitelist +++ b/scripts/maint/fallback.whitelist @@ -12,7 +12,8 @@ # To replace this list with the hard-coded fallback list (for testing), use # a command similar to: -# cat src/or/fallback_dirs.inc | grep \" | grep -v weight | tr -d '\n' | \ +# cat src/app/config/fallback_dirs.inc | grep \" | grep -v weight | \ +# tr -d '\n' | \ # sed 's/"" / /g' | sed 's/""/"/g' | tr \" '\n' | grep -v '^$' \ # > scripts/maint/fallback.whitelist # diff --git a/scripts/maint/updateFallbackDirs.py b/scripts/maint/updateFallbackDirs.py index b093463e08..355dc027df 100755 --- a/scripts/maint/updateFallbackDirs.py +++ b/scripts/maint/updateFallbackDirs.py @@ -3,11 +3,11 @@ # Usage: # # Regenerate the list: -# scripts/maint/updateFallbackDirs.py > src/or/fallback_dirs.inc 2> fallback_dirs.log +# scripts/maint/updateFallbackDirs.py > src/app/config/fallback_dirs.inc 2> fallback_dirs.log # # Check the existing list: # scripts/maint/updateFallbackDirs.py check_existing > fallback_dirs.inc.ok 2> fallback_dirs.log -# mv fallback_dirs.inc.ok src/or/fallback_dirs.inc +# mv fallback_dirs.inc.ok src/app/config/fallback_dirs.inc # # This script should be run from a stable, reliable network connection, # with no other network activity (and not over tor). @@ -112,7 +112,7 @@ DOWNLOAD_MICRODESC_CONSENSUS = True # expired consensus. This makes them fail the download check. # We use a tolerance of 0, so that 0.2.x series relays also fail the download # check if they serve an expired consensus. -CONSENSUS_EXPIRY_TOLERANCE = 0 +CONSENSUS_EXPIRY_TOLERANCE = 0 # Output fallback name, flags, bandwidth, and ContactInfo in a C comment? OUTPUT_COMMENTS = True if OUTPUT_CANDIDATES else False @@ -161,7 +161,7 @@ BLACKLIST_EXCLUDES_WHITELIST_ENTRIES = True WHITELIST_FILE_NAME = 'scripts/maint/fallback.whitelist' BLACKLIST_FILE_NAME = 'scripts/maint/fallback.blacklist' -FALLBACK_FILE_NAME = 'src/or/fallback_dirs.inc' +FALLBACK_FILE_NAME = 'src/app/config/fallback_dirs.inc' # The number of bytes we'll read from a filter file before giving up MAX_LIST_FILE_SIZE = 1024 * 1024 diff --git a/scripts/test/coverage b/scripts/test/coverage index 75a793a452..59d468ee1e 100755 --- a/scripts/test/coverage +++ b/scripts/test/coverage @@ -7,7 +7,7 @@ dst=$1 -for fn in src/or/*.c src/or/*/*.c src/common/*.c src/lib/*/*.c; do +for fn in src/core/*/*.c src/feature/*/*.c src/app/*/*.c src/lib/*/*.c; do BN=`basename $fn` DN=`dirname $fn` F=`echo $BN | sed -e 's/\.c$//;'` |