From 22cd3411a5f1587f8f970fc05bd64fe94d4e0523 Mon Sep 17 00:00:00 2001 Message-Id: <22cd3411a5f1587f8f970fc05bd64fe94d4e0523.1715364620.git.mdw@distorted.org.uk> From: Mark Wooding Date: Tue, 22 Apr 2008 18:32:11 +0100 Subject: [PATCH] Restore vpath'd builds Organization: Straylight/Edgeware From: Richard Kettlewell --- tests/dtest.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/dtest.py b/tests/dtest.py index c37872d..62cf74c 100644 --- a/tests/dtest.py +++ b/tests/dtest.py @@ -1,7 +1,7 @@ #-*-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 @@ -32,7 +32,7 @@ def fatal(s): 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") @@ -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) - 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. -- [mdw]