[PATCH branch-2.1 6/6] Run unittests in a temporary directory

[Michael Hanselmann]

---
 Makefile.am       |    7 +++++--
 test/testutils.py |    6 ++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 71364a6..e3b6990 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -263,7 +263,9 @@ nodist_TESTS =
 
 TESTS = $(dist_TESTS) $(nodist_TESTS)
 
-TESTS_ENVIRONMENT = PYTHONPATH=.:$(top_builddir) $(PYTHON)
+TESTS_ENVIRONMENT = \
+       PYTHONPATH=. TOP_SRCDIR=$(abs_top_srcdir) \
+       $(RUN_IN_TEMPDIR) $(PYTHON)
 
 all-local: stamp-directories devel/upload \
        doc/examples/bash_completion \
@@ -357,7 +359,8 @@ srclinks: stamp-directories
        set -e; \
        for i in man/footer.sgml $(pkgpython_PYTHON) $(hypervisor_PYTHON) \
                        $(rapi_PYTHON) $(http_PYTHON) $(confd_PYTHON) \
-                       $(dist_sbin_SCRIPTS) $(dist_tools_SCRIPTS); do \
+                       $(dist_sbin_SCRIPTS) $(dist_tools_SCRIPTS) \
+                       $(dist_TESTS); do \
                if test ! -f $$i -a -f $(abs_top_srcdir)/$$i; then \
                        $(LN_S) $(abs_top_srcdir)/$$i $$i; \
                fi; \
diff --git a/test/testutils.py b/test/testutils.py
index c0932cc..b4d286e 100644
--- a/test/testutils.py
+++ b/test/testutils.py
@@ -83,10 +83,8 @@ class GanetiTestCase(unittest.TestCase):
         be used in 'make distcheck' rules
 
     """
-    prefix = os.environ.get("srcdir", "")
-    if prefix:
-      prefix = prefix + "/test/"
-    return "%sdata/%s" % (prefix, name)
+    prefix = os.environ.get("TOP_SRCDIR", ".")
+    return "%s/test/data/%s" % (prefix, name)
 
   @classmethod
   def _ReadTestData(cls, name):
-- 
1.6.3.4