aboutsummaryrefslogtreecommitdiff
path: root/src/test/include.am
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-06-11 17:49:38 -0400
committerNick Mathewson <nickm@torproject.org>2018-06-21 08:56:20 -0400
commitcacf326e78bee705d14dd61329160c8d71fa3ef8 (patch)
treeb79a0e4a370422ca7a98685abcc2ad3494f9c34b /src/test/include.am
parentfa195626bdc12c99d60c7a909b9e1b632bc0c4f4 (diff)
downloadtor-cacf326e78bee705d14dd61329160c8d71fa3ef8.tar.gz
tor-cacf326e78bee705d14dd61329160c8d71fa3ef8.zip
Revise geoip tests to not require paths of actual geoip config
When I wrote the first one of these, it needed the path of the geoip file. But that doesn't translate well in at least two cases: - Mingw, where the compile-time path is /c/foo/bar and the run-time path is c:\foo\bar. - Various CI weirdnesses, where we cross-compile a test binary, then copy it into limbo and expect it to work. Together, these problems precluded these tests running on windows. So, instead let's just generate some minimal files ourselves, and test against them. Fixes bug 25787
Diffstat (limited to 'src/test/include.am')
-rw-r--r--src/test/include.am1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/test/include.am b/src/test/include.am
index 9543635c84..40f060c257 100644
--- a/src/test/include.am
+++ b/src/test/include.am
@@ -345,7 +345,6 @@ src_test_test_bt_cl_CPPFLAGS= $(src_test_AM_CPPFLAGS) $(TEST_CPPFLAGS)
EXTRA_DIST += \
src/test/bt_test.py \
- src/test/geoip_dummy \
src/test/ntor_ref.py \
src/test/hs_ntor_ref.py \
src/test/hs_build_address.py \