tests: make test-with-fake-pkg's unacceptably-old fake pycryptopp be 0.5.13 instead of 0.5.17, since 0.5.17 is acceptably new on non-x86 archs
Also move the fakepkgs directory to be in misc/build_helpers/ instead of in the base of the source tree.
This commit is contained in:
parent
56f4c1218b
commit
c3b1bca954
|
@ -1,23 +1,24 @@
|
||||||
#!/usr/bin/env python
|
#!/usr/bin/env python
|
||||||
|
|
||||||
# We put a fake "pycryptopp-0.5.17" package on the PYTHONPATH so that
|
# We put a fake "pycryptopp-0.5.13" package on the PYTHONPATH so that
|
||||||
# the build system thinks pycryptopp-0.5.17 is already installed. Then
|
# the build system thinks pycryptopp-0.5.13 is already installed. Then
|
||||||
# we execute run_trial.py. If the build system is too naive/greedy
|
# we execute run_trial.py. If the build system is too naive/greedy
|
||||||
# about finding dependencies, it will latch onto the
|
# about finding dependencies, it will latch onto the
|
||||||
# "pycryptopp-0.5.17" and then will be unable to satisfy the
|
# "pycryptopp-0.5.13" and then will be unable to satisfy the
|
||||||
# requirement (from _auto_deps.py) for pycryptopp >= 0.5.20. This is
|
# requirement (from _auto_deps.py) for pycryptopp >= 0.5.20 (or
|
||||||
|
# pycryptopp >= 0.5.14, depending on machine architecture). This is
|
||||||
# currently happening on trunk, see #1190. So with trunk, running
|
# currently happening on trunk, see #1190. So with trunk, running
|
||||||
# test-with-fake-pkg.py shows a failure, but with the ticket1190
|
# test-with-fake-pkg.py shows a failure, but with the ticket1190
|
||||||
# branch, test-with-fake-pkg.py succeeds.
|
# branch, test-with-fake-pkg.py succeeds.
|
||||||
|
|
||||||
import glob, os, subprocess, sys
|
import glob, os, subprocess, sys
|
||||||
|
|
||||||
|
fakepkgdir = 'misc/build_helpers/fakepkgs'
|
||||||
fakepkgname = "pycryptopp"
|
fakepkgname = "pycryptopp"
|
||||||
fakepkgversion = "0.5.17"
|
fakepkgversion = "0.5.13"
|
||||||
# testsuite = "allmydata.test.test_cli"
|
|
||||||
testsuite = "allmydata.test.test_base62"
|
testsuite = "allmydata.test.test_base62"
|
||||||
|
|
||||||
pkgdirname = os.path.join(os.getcwd(), '%s-%s.egg' % (fakepkgname, fakepkgversion))
|
pkgdirname = os.path.join(os.getcwd(), fakepkgdir, '%s-%s.egg' % (fakepkgname, fakepkgversion))
|
||||||
|
|
||||||
try:
|
try:
|
||||||
os.makedirs(pkgdirname)
|
os.makedirs(pkgdirname)
|
||||||
|
|
Loading…
Reference in New Issue