X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=system%2FMakefile;h=6830c5c85bde652106efd0755757ef197cc6e9fc;hb=e3aec92ad64caf56a5b7c10fac8a4b3fb250940e;hp=06f28172164e79a655b35f7b9654c5db3df9ee56;hpb=6a3d332f76020150e2ba053e19cafaa4b84f9ed0;p=tests.git diff --git a/system/Makefile b/system/Makefile index 06f2817..6830c5c 100644 --- a/system/Makefile +++ b/system/Makefile @@ -5,11 +5,11 @@ tags: #################### -########## make sync PLCHOST=hostname VSERVER=vservername -ifdef PLCHOST -ifdef BUILDNAME -PLCSSH:=root@$(PLCHOST):$(BUILDNAME) -endif +TESTMASTER ?= testmaster.onelab.eu + +########## make sync TESTMASTER=hostname BUILD=vservername +ifdef BUILD +PLCSSH:=root@$(TESTMASTER):$(BUILD) endif LOCAL_RSYNC_EXCLUDES := --exclude '*.pyc' --exclude 'arg*' @@ -19,8 +19,11 @@ RSYNC := rsync -a -v $(RSYNC_COND_DRY_RUN) $(RSYNC_EXCLUDES) sync: ifeq (,$(PLCSSH)) - echo "sync: You must define PLCHOST and BUILDNAME on the command line" - echo " e.g. make sync PLCHOST=private.one-lab.org BUILDNAME=" ; exit 1 + echo "sync: You must define TESTMASTER and BUILD on the command line" + echo " e.g. make sync TESTMASTER=testmaster.onelab.eu BUILD=2009.07.10--1l-f8-32" ; exit 1 else +$(RSYNC) ./ $(PLCSSH) endif + + +