summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorlassulus <lass@aidsballs.de>2016-08-04 21:38:20 +0200
committerlassulus <lass@aidsballs.de>2016-08-04 21:38:20 +0200
commit37d53d7b2578106b3d2c53650bfad0e9d5489fbd (patch)
treee3c61342a43abc82ab00cc35eee591dc98ef69e6 /Makefile
parent6696a9f09846adcc059a29566c949afc518b7574 (diff)
parent048986e09bfe9195ccd434c4c143d374db5488d2 (diff)
Merge remote-tracking branch 'cd/master'
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile7
1 files changed, 6 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 3857a2390..4fa5bc885 100644
--- a/Makefile
+++ b/Makefile
@@ -130,7 +130,12 @@ $(error bad method: $(method))
endif
endif
test: ssh ?= ssh
+ifeq ($(target_user)@$(target_host),$(LOGNAME)@$(HOSTNAME))
+test: wrapper = exec
+else
+test: wrapper = $(ssh) $(target_user)@$(target_host) -p $(target_port)
+endif
test: populate
- $(ssh) $(target_user)@$(target_host) -p $(target_port) \
+ $(wrapper) \
$(command) --show-trace -I $(target_path) \
-A config.system.build.toplevel $(target_path)/stockholm