Skip to content

Commit 6bfbd11

Browse files
committed
run tests on the remote device even when the default address is used
When running tests inside the Android emulator, bootstrap doesn't set the TEST_DEVICE_ADDR environment variable, as the default address (127.0.0.1:12345) is used. Instead, REMOTE_TEST_CLIENT is set all the times when remote testing is needed, and in no other cases. To ensure Android tests are executed in the emulator, change the check.
1 parent 6d81602 commit 6bfbd11

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

src/test/run-make-fulldeps/tools.mk

+3-3
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ endif
4040
# e.g. for `$(CC) -o $(RUN_BINFILE)`.
4141
RUN_BINFILE = $(TMPDIR)/$(1)
4242

43-
# Invoke the generated binary on the remote machine if a test address is
44-
# provided, otherwise run it on the current host.
45-
ifdef TEST_DEVICE_ADDR
43+
# Invoke the generated binary on the remote machine if compiletest was
44+
# configured to use a remote test device, otherwise run it on the current host.
45+
ifdef REMOTE_TEST_CLIENT
4646
# FIXME: if a test requires additional files, this will need to be changed to
4747
# also push them (by changing the 0 to the number of additional files, and
4848
# providing the path of the additional files as the last arguments).

0 commit comments

Comments
 (0)