facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-06 23:07:18 +03:00
Code Issues Projects Releases Wiki Activity

tests: fix buck run :run_tests

Browse Source 
Summary:
`buck run :run_tests -- ...` was added to be a buck version of `run-tests.py`.
However it does not work because the watchman path provided was invalided.

Reviewed By: xavierd

Differential Revision: D18892361

fbshipit-source-id: 8745a33e0d19b14f042ef1cd255d10c5737dffb1
This commit is contained in:
Jun Wu 2019-12-09 15:24:31 -08:00 committed by Facebook Github Bot
parent 75a8173a10
commit a3129104fe
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
eden/scm/tests/unittestify.py
View File

@ -17,6 +17,7 @@ import unittest
try:
# Used by :run_tests binary target
import libfb.py.pathutils as pathutils
hgpath = pathutils.get_build_rule_output_path(
@ -24,9 +25,18 @@ try:
)
pythonbinpath = pathutils.get_build_rule_output_path("//eden/scm:hgpython")
watchman = pathutils.get_build_rule_output_path("//watchman:watchman")
# XXX: the above function might return "watchman.par" which does not exist.
# Fix it by stripping ".par".
if not os.path.exists(watchman):
alternative = watchman[:-4] # strip ".par"
if os.path.exists(alternative):
watchman = alternative
else:
watchman = None
mononoke_server = pathutils.get_build_rule_output_path("//scm/mononoke:mononoke")
mononoke_hgcli = pathutils.get_build_rule_output_path("//scm/mononoke/hgcli:hgcli")
except ImportError:
# Used by :hg_run_tests and :hg_watchman_run_tests unittest target
hgpath = os.environ.get("HGTEST_HG")
pythonbinpath = os.environ.get("HGTEST_PYTHON", "python2")
watchman = os.environ.get("HGTEST_WATCHMAN")