From a6eb434b57b0577d432bf5cec2ff773518a038b0 Mon Sep 17 00:00:00 2001 From: Brian Warner Date: Fri, 30 Jan 2009 04:25:36 -0700 Subject: [PATCH] Makefile: use 'setup.py test' for test/quicktest targets (instead of 'setup.py trial'). 'setup.py trial' clobbers the tahoe .egg's PKG-INFO "Version:" field (resetting it to 0.0.0), possibly because it isn't invoking the darcsver subcommand that 'setup.py test' does before it runs the 'trial' subcommand. This slows down quicktest by another couple of seconds (see #591) and adds more noise to its output, but without this change, 'make test' and 'make quicktest' fail on test_runner (which spawns bin/tahoe as a subprocess, and with a mangled Version:, the setuptools-based entry point script refuses to recognize our source tree as a usable version of Tahoe). --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 5693fa89..c93d8285 100644 --- a/Makefile +++ b/Makefile @@ -109,10 +109,10 @@ TEST=allmydata # suppress the ansi color sequences test: build src/allmydata/_version.py - $(PYTHON) setup.py trial $(TRIALARGS) -s $(TEST) + $(PYTHON) setup.py test $(TRIALARGS) -s $(TEST) quicktest: .built .checked-deps - $(PYTHON) setup.py trial $(TRIALARGS) -s $(TEST) + $(PYTHON) setup.py test $(TRIALARGS) -s $(TEST) fuse-test: .built .checked-deps $(RUNPP) -d contrib/fuse -p -c runtests.py -- 2.45.2