Revision f848ac00

b/Makefile.am
263 263

  
264 264
TESTS = $(dist_TESTS) $(nodist_TESTS)
265 265

  
266
TESTS_ENVIRONMENT = PYTHONPATH=.:$(top_builddir) $(PYTHON)
266
TESTS_ENVIRONMENT = \
267
	PYTHONPATH=. TOP_SRCDIR=$(abs_top_srcdir) \
268
	$(RUN_IN_TEMPDIR) $(PYTHON)
267 269

  
268 270
all-local: stamp-directories devel/upload \
269 271
	doc/examples/bash_completion \
......
357 359
	set -e; \
358 360
	for i in man/footer.sgml $(pkgpython_PYTHON) $(hypervisor_PYTHON) \
359 361
			$(rapi_PYTHON) $(http_PYTHON) $(confd_PYTHON) \
360
			$(dist_sbin_SCRIPTS) $(dist_tools_SCRIPTS); do \
362
			$(dist_sbin_SCRIPTS) $(dist_tools_SCRIPTS) \
363
			$(dist_TESTS); do \
361 364
		if test ! -f $$i -a -f $(abs_top_srcdir)/$$i; then \
362 365
			$(LN_S) $(abs_top_srcdir)/$$i $$i; \
363 366
		fi; \
b/test/testutils.py
83 83
        be used in 'make distcheck' rules
84 84

  
85 85
    """
86
    prefix = os.environ.get("srcdir", "")
87
    if prefix:
88
      prefix = prefix + "/test/"
89
    return "%sdata/%s" % (prefix, name)
86
    prefix = os.environ.get("TOP_SRCDIR", ".")
87
    return "%s/test/data/%s" % (prefix, name)
90 88

  
91 89
  @classmethod
92 90
  def _ReadTestData(cls, name):

Also available in: Unified diff