Skip to content

Commit

Permalink
Fix TESTPYTHON path for out-of-tree builds
Browse files Browse the repository at this point in the history
Summary:
This use of `$(PWD)`, from D50354346, isn't correct: it inherits
whatever `$PWD` happened to be in the calling shell. If you use an out-of-tree
build and run `make -C foo/...`, `$PWD` won't point at `foo/...`. `$CURDIR` is
set by `make` and provides what we want.

Reviewed By: mpage

Differential Revision: D52547938

fbshipit-source-id: 1e0edcafcd2fb5362419c12fae82137c6d826622
  • Loading branch information
swtaarrs authored and facebook-github-bot committed Jan 5, 2024
1 parent 3741a34 commit e0b51d1
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion Makefile.pre.in
Original file line number Diff line number Diff line change
Expand Up @@ -1646,7 +1646,7 @@ $(CINDERX_OBJS): $(CINDERX_PRIVATE_HEADERS) $(CINDERX_PUBLIC_HEADERS) $(PYTHON_H
######################################################################

TESTOPTS= $(EXTRATESTOPTS)
TESTPYTHON= $(RUNSHARED) $(PWD)/$(BUILDPYTHON) $(TESTPYTHONOPTS)
TESTPYTHON= $(RUNSHARED) $(CURDIR)/$(BUILDPYTHON) $(TESTPYTHONOPTS)
TESTRUNNER= $(TESTPYTHON) -X usepycompiler $(srcdir)/Tools/scripts/run_tests.py
TESTRUNNERLAZYIMPORTS= $(TESTPYTHON) -L $(srcdir)/Tools/scripts/run_tests.py
TESTTIMEOUT= 1200
Expand Down

0 comments on commit e0b51d1

Please sign in to comment.