[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
Re: [tor-bugs] #12640 [Tor]: Entry guard unittest (#12207) fail in out-of-tree builds
#12640: Entry guard unittest (#12207) fail in out-of-tree builds
------------------------+--------------------------------
Reporter: asn | Owner:
Type: defect | Status: new
Priority: normal | Milestone: Tor: 0.2.5.x-final
Component: Tor | Version:
Resolution: | Keywords: tor-guard
Actual Points: | Parent ID:
Points: |
------------------------+--------------------------------
Comment (by weasel):
This makes it build once more:
{{{
diff --git a/configure.ac b/configure.ac
index 414c72a..20e91d0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1395,6 +1395,13 @@ AC_SUBST(BUILDDIR)
AH_TEMPLATE([BUILDDIR],[tor's build directory])
AC_DEFINE_UNQUOTED(BUILDDIR,"$BUILDDIR")
+if test "x$SRCDIR" = "x"; then
+ SRCDIR=${srcdir}
+fi
+AC_SUBST(SRCDIR)
+AH_TEMPLATE([SRCDIR],[tor's source directory (relative to top level
build-tree)])
+AC_DEFINE_UNQUOTED(SRCDIR,"$SRCDIR")
+
if test "x$CONFDIR" = "x"; then
CONFDIR=`eval echo $sysconfdir/tor`
fi
diff --git a/src/test/test_entrynodes.c b/src/test/test_entrynodes.c
index 1be0ce1..3c73a0b 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 = SRCDIR "/src/test/test_descriptors.txt";
(void) testcase;
}}}
--
Ticket URL: <https://trac.torproject.org/projects/tor/ticket/12640#comment:1>
Tor Bug Tracker & Wiki <https://trac.torproject.org/>
The Tor Project: anonymity online
_______________________________________________
tor-bugs mailing list
tor-bugs@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-bugs