[tor-commits] [flashproxy/master] - fix VPATH build and `make distcheck`

[infinity0 at torproject.org]

commit 0f6d43d6f9b08876f5d19bd9ffeb5b4e404164de
Author: Ximin Luo <infinity0 at gmx.com>
Date:   Tue Oct 15 15:08:35 2013 +0100

    - fix VPATH build and `make distcheck`
---
 facilitator/Makefile.am         |    2 ++
 facilitator/facilitator-test.py |    4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/facilitator/Makefile.am b/facilitator/Makefile.am
index 0164d76..d4a4021 100644
--- a/facilitator/Makefile.am
+++ b/facilitator/Makefile.am
@@ -34,6 +34,8 @@ AM_PY_LOG_FLAGS =
 # see http://www.gnu.org/software/automake/manual/html_node/Scripts.html
 CLEANFILES = $(initscript_SCRIPTS)
 
+EXTRA_DIST = $(TESTS)
+
 # our own targets
 
 # The {pre,post}-{install,remove} targets are just given as reference, and
diff --git a/facilitator/facilitator-test.py b/facilitator/facilitator-test.py
index 6dec76d..e5ed843 100755
--- a/facilitator/facilitator-test.py
+++ b/facilitator/facilitator-test.py
@@ -1,5 +1,6 @@
 #!/usr/bin/env python
 
+import os
 import socket
 import subprocess
 import time
@@ -28,7 +29,8 @@ class FacilitatorTest(unittest.TestCase):
         return gimme_socket(FACILITATOR_HOST, FACILITATOR_PORT)
 
     def setUp(self):
-        self.process = subprocess.Popen(["./facilitator", "-d", "-p", str(FACILITATOR_PORT), "-r", "0.0.1.0:1", "-l", "/dev/null"])
+        fn = os.path.join(os.path.dirname(__file__), "./facilitator")
+        self.process = subprocess.Popen(["python", fn, "-d", "-p", str(FACILITATOR_PORT), "-r", "0.0.1.0:1", "-l", "/dev/null"])
         time.sleep(0.1)
 
     def tearDown(self):