X-Git-Url: https://git.distorted.org.uk/~mdw/disorder/blobdiff_plain/c9467b7a34160c4e25580a2dc82087c5ae0bb2d0..b7705fd6c7efcba639acddfbe7979829cc6a8eb2:/tests/Makefile.am

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 5563f7f..633c73c 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,6 +1,6 @@
 #
 # This file is part of DisOrder.
-# Copyright (C) 2004, 2005, 2007-2009 Richard Kettlewell
+# Copyright (C) 2004, 2005, 2007-2009, 2011, 2013 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
@@ -18,6 +18,7 @@
 
 noinst_PROGRAMS=disorder-udplog
 
+AUTOMAKE_OPTIONS=subdir-objects
 AM_CPPFLAGS=-I${top_srcdir}/lib -I../lib
 
 disorder_udplog_SOURCES=udplog.c ../lib/memgc.c
@@ -25,10 +26,10 @@ disorder_udplog_LDADD=$(LIBOBJS) ../lib/libdisorder.a $(LIBGC)
 disorder_udplog_DEPENDENCIES=../lib/libdisorder.a
 
 TESTS=cookie.py dbversion.py dump.py files.py play.py queue.py	\
-	recode.py search.py user-upgrade.py user.py aliases.py	\
+	recode.py search.py user.py aliases.py	\
 	schedule.py hashes.py playlists.py
 
-TESTS_ENVIRONMENT=${PYTHON} -u
+AM_TESTS_ENVIRONMENT=PYTHONUNBUFFERED=true;export PYTHONUNBUFFERED;
 
 clean-local:
 	rm -rf testroot *.log *.pyc