mirror of
https://github.com/corda/corda.git
synced 2025-01-04 04:04:27 +00:00
set remote-test variable based on the presence of remote-test-host or remote-test-port
The new way to run a remote test is: make arch=<arch> remote-test-host=<host_to_test_on> test
This commit is contained in:
parent
d4494aef9a
commit
9a91c1dd2d
16
makefile
16
makefile
@ -270,8 +270,18 @@ as = $(cc)
|
|||||||
ld = $(cc)
|
ld = $(cc)
|
||||||
build-ld = $(build-cc)
|
build-ld = $(build-cc)
|
||||||
|
|
||||||
remote-test-host = localhost
|
default-remote-test-host = localhost
|
||||||
remote-test-port = 22
|
default-remote-test-port = 22
|
||||||
|
ifeq ($(remote-test-host),)
|
||||||
|
remote-test-host = $(default-remote-test-host)
|
||||||
|
else
|
||||||
|
remote-test = true
|
||||||
|
endif
|
||||||
|
ifeq ($(remote-test-port),)
|
||||||
|
remote-test-port = $(default-remote-test-port)
|
||||||
|
else
|
||||||
|
remote-test = true
|
||||||
|
endif
|
||||||
remote-test-user = ${USER}
|
remote-test-user = ${USER}
|
||||||
remote-test-dir = /tmp/avian-test-${USER}
|
remote-test-dir = /tmp/avian-test-${USER}
|
||||||
|
|
||||||
@ -1272,7 +1282,7 @@ test: build $(build)/run-tests.sh $(build)/test.sh $(unittest-executable)
|
|||||||
ifneq ($(remote-test),true)
|
ifneq ($(remote-test),true)
|
||||||
/bin/sh $(build)/run-tests.sh
|
/bin/sh $(build)/run-tests.sh
|
||||||
else
|
else
|
||||||
@echo "testing remotely..."
|
@echo "running tests on $(remote-test-user)@$(remote-test-host):$(remote-test-port), in $(remote-test-dir)"
|
||||||
rsync $(build) -rav --exclude '*.o' --rsh="ssh -p$(remote-test-port)" $(remote-test-user)@$(remote-test-host):$(remote-test-dir)
|
rsync $(build) -rav --exclude '*.o' --rsh="ssh -p$(remote-test-port)" $(remote-test-user)@$(remote-test-host):$(remote-test-dir)
|
||||||
ssh -p$(remote-test-port) $(remote-test-user)@$(remote-test-host) sh "$(remote-test-dir)/$(platform)-$(arch)$(options)/run-tests.sh"
|
ssh -p$(remote-test-port) $(remote-test-user)@$(remote-test-host) sh "$(remote-test-dir)/$(platform)-$(arch)$(options)/run-tests.sh"
|
||||||
endif
|
endif
|
||||||
|
Loading…
Reference in New Issue
Block a user