ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-04-08 03:14:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Makefile: remove/deprecate old targets

Browse Source 
This replaces the following targets with "echo this is obsolete":

* fetch-and-unpack-deps (used by the old 'tarballs' builder, for SUMO tarballs)
* test-desert-island (used by the old 'clean' builder)
* test-pip-install (used by 'new-pip' builder before we switched)

It also removes the test-pip-install.py helper script.
This commit is contained in:
Brian Warner 2016-03-22 14:10:08 -07:00
parent 1fb7cc7f18
commit 1f712c8ddb
2 changed files with 3 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Makefile
View File

@ -191,26 +191,17 @@ find-trailing-spaces:
-$(PYTHON) misc/coding_tools/find-trailing-spaces.py -r $(SOURCES)
@echo
# The test-desert-island target grabs the tahoe-deps tarball, unpacks it,
# does a build, then asserts that the build did not try to download anything
# as it ran. Invoke this on a new tree, or after a 'clean', to make sure the
# support/lib/ directory is gone.
.PHONY: fetch-and-unpack-deps
fetch-and-unpack-deps:
test -f tahoe-deps.tar.gz || wget https://tahoe-lafs.org/source/tahoe-lafs/deps/tahoe-lafs-deps.tar.gz
rm -rf tahoe-deps
tar xzf tahoe-lafs-deps.tar.gz
@echo "test-and-unpack-deps is obsolete"
.PHONY: test-desert-island
test-desert-island:
$(MAKE) fetch-and-unpack-deps
$(MAKE) 2>&1 | tee make.out
$(PYTHON) misc/build_helpers/check-build.py make.out no-downloads
@echo "test-desert-island is obsolete"
.PHONY: test-pip-install
test-pip-install:
$(PYTHON) misc/build_helpers/test-pip-install.py
@echo "test-pip-install is obsolete"
# TARBALL GENERATION
.PHONY: tarballs

31
misc/build_helpers/test-pip-install.py
View File

@ -1,31 +0,0 @@
import os, shutil
from subprocess import check_call
# Install tahoe into a new virtualenv, move aside the source tree, run a test
# with the installed tahoe. This ensures that the installed code isn't
# depending upon anything from the source tree. Requires 'pip' and
# 'virtualenv' to be installed, and enough compilers/libraries (libffi-dev)
# to enable 'pip install'.
# This runs a lot faster if you've cached wheels first. Edit ~/.pip/pip.conf
# to have [global] wheel-dir=find-links=/HOME/.pip/wheels, then run 'pip
# wheel .' from the tahoe tree.
assert os.path.exists("Tahoe.home"), "Run this from the top of the source tree."
VE = "test-pip-install-virtualenv"
print "creating virtualenv.."
if os.path.exists(VE):
shutil.rmtree(VE)
check_call(["virtualenv", VE])
print "running 'pip install .' from virtualenv.."
check_call(["%s/bin/pip" % VE, "install", "."])
try:
print "moving src/ out of the away"
os.rename("src", "src-disabled-by-test-pip-install")
print "running 'trial allmydata.test.test_web' from virtualenv.."
rc = check_call(["%s/bin/trial" % VE, "allmydata.test.test_web"])
finally:
print "moving src/ back"
os.rename("src-disabled-by-test-pip-install", "src")