diff options
| author | Pietro Albini <pietro.albini@ferrous-systems.com> | 2022-11-03 16:04:07 +0100 |
|---|---|---|
| committer | Pietro Albini <pietro.albini@ferrous-systems.com> | 2022-11-17 09:37:41 +0100 |
| commit | 6bfbd113e25f83761a232404e6ff71af5d07614a (patch) | |
| tree | 6f8752504b76eb2f74aa2f22f2bf4f415761d037 | |
| parent | 6d8160261ff3aee3b6eaacc37ac96cafff530980 (diff) | |
| download | rust-6bfbd113e25f83761a232404e6ff71af5d07614a.tar.gz rust-6bfbd113e25f83761a232404e6ff71af5d07614a.zip | |
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.
| -rw-r--r-- | src/test/run-make-fulldeps/tools.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/test/run-make-fulldeps/tools.mk b/src/test/run-make-fulldeps/tools.mk index 80e6704e0d0..0f5425daa16 100644 --- a/src/test/run-make-fulldeps/tools.mk +++ b/src/test/run-make-fulldeps/tools.mk @@ -40,9 +40,9 @@ endif # e.g. for `$(CC) -o $(RUN_BINFILE)`. RUN_BINFILE = $(TMPDIR)/$(1) -# Invoke the generated binary on the remote machine if a test address is -# provided, otherwise run it on the current host. -ifdef TEST_DEVICE_ADDR +# Invoke the generated binary on the remote machine if compiletest was +# configured to use a remote test device, otherwise run it on the current host. +ifdef REMOTE_TEST_CLIENT # FIXME: if a test requires additional files, this will need to be changed to # also push them (by changing the 0 to the number of additional files, and # providing the path of the additional files as the last arguments). |