Restore vpath'd builds

diff --git a/tests/dtest.py b/tests/dtest.py
index c37872d6baae568e5ff5e955f4c0a071d10f0cb4..62cf74cbd44bdd127af1dcf79304cf1f960d6d28 100644 (file)
--- a/tests/dtest.py
+++ b/tests/dtest.py
@@ -1,7 +1,7 @@
 #-*-python-*-
 #
 # This file is part of DisOrder.
 #-*-python-*-
 #
 # This file is part of DisOrder.

-# Copyright (C) 2007 ,2008 Richard Kettlewell
+# Copyright (C) 2007, 2008 Richard Kettlewell

 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by


@@ -32,7 +32,7 @@ def fatal(s):
 cwd = os.getcwd()
 if os.path.exists("config.h"):
     top_builddir = cwd
 cwd = os.getcwd()
 if os.path.exists("config.h"):
     top_builddir = cwd

-elif os.path.exists("alltests"):
+elif os.path.exists("../config.h"):

     top_builddir = os.path.dirname(cwd)
 else:
     fatal("cannot identify build directory")
     top_builddir = os.path.dirname(cwd)
 else:
     fatal("cannot identify build directory")


@@ -87,7 +87,7 @@ Make track with relative path S exist"""
     trackdir = os.path.dirname(trackpath)
     if not os.path.exists(trackdir):
         os.makedirs(trackdir)
     trackdir = os.path.dirname(trackpath)
     if not os.path.exists(trackdir):
         os.makedirs(trackdir)

-    copyfile("%s/sounds/long.ogg" % top_srcdir, trackpath)
+    copyfile("%s/sounds/long.ogg" % top_builddir, trackpath)

     # We record the tracks we created so they can be tested against
     # server responses.  We put them into NFC since that's what the server
     # uses internally.
     # We record the tracks we created so they can be tested against
     # server responses.  We put them into NFC since that's what the server
     # uses internally.