diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-07-16 21:07:22 +0200 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-07-16 21:07:22 +0200 |
| commit | facecce176c8fe15653676557c6151c4ea1ca994 (patch) | |
| tree | c3759eee868edee4a19c11f6c54b785d14740f83 | |
| parent | b408125288ad6943d7ed3b468ad9179a93d1359c (diff) | |
| download | tor-facecce176c8fe15653676557c6151c4ea1ca994.tar.gz tor-facecce176c8fe15653676557c6151c4ea1ca994.zip | |
Fix tests when building out-of-tree
(This was too hard. Silly autoconf.)
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | src/test/test_entrynodes.c | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 414c72a42c..40e2558b15 100644 --- a/configure.ac +++ b/configure.ac @@ -1407,6 +1407,14 @@ AC_SUBST(BINDIR) LOCALSTATEDIR=`eval echo $localstatedir` AC_SUBST(LOCALSTATEDIR) +case "$srcdir" in + /*) TOP_SRCDIR=$srcdir;; + *) TOP_SRCDIR=$PWD/$srcdir;; +esac + +AH_TEMPLATE([TOP_SRCDIR],[source directory we're building from]) +AC_DEFINE_UNQUOTED(TOP_SRCDIR,"$TOP_SRCDIR") + if test "$bwin32" = true; then # Test if the linker supports the --nxcompat and --dynamicbase options # for Windows diff --git a/src/test/test_entrynodes.c b/src/test/test_entrynodes.c index 1be0ce126b..285a5ae0cf 100644 --- a/src/test/test_entrynodes.c +++ b/src/test/test_entrynodes.c @@ -115,7 +115,7 @@ static void * fake_network_setup(const struct testcase_t *testcase) { /* This is the file containing our test descriptors. */ - const char *fname = BUILDDIR "/src/test/test_descriptors.txt"; + const char *fname = TOP_SRCDIR "/src/test/test_descriptors.txt"; (void) testcase; |