nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-27 22:03:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix tests when building out-of-tree

Browse Source 
(This was too hard. Silly autoconf.)
This commit is contained in:
Nick Mathewson 2014-07-16 21:07:22 +02:00
parent b408125288
commit facecce176
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
configure.ac
View File

@ -1407,6 +1407,14 @@ AC_SUBST(BINDIR)
LOCALSTATEDIR=`eval echo $localstatedir` LOCALSTATEDIR=`eval echo $localstatedir`
AC_SUBST(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 if test "$bwin32" = true; then
# Test if the linker supports the --nxcompat and --dynamicbase options # Test if the linker supports the --nxcompat and --dynamicbase options
# for Windows # for Windows

2
src/test/test_entrynodes.c
View File

@ -115,7 +115,7 @@ static void *
fake_network_setup(const struct testcase_t *testcase) fake_network_setup(const struct testcase_t *testcase)
{ {
/* This is the file containing our test descriptors. */ /* 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; (void) testcase;