X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=system%2FMakefile;h=61be534550c7a40a5becabbd3910b4f01043586e;hb=8a79bf198b710742b8bce1a94d83f19fb39792ee;hp=06f28172164e79a655b35f7b9654c5db3df9ee56;hpb=6a3d332f76020150e2ba053e19cafaa4b84f9ed0;p=tests.git diff --git a/system/Makefile b/system/Makefile index 06f2817..61be534 100644 --- a/system/Makefile +++ b/system/Makefile @@ -1,26 +1,26 @@ tags: - find . '(' -name '*.py' -o -name 'qemu-*' ')' | grep -v '.svn/' | xargs etags + find . '(' -name '*.py' -o -name 'qemu-*' ')' | grep -v '.git/' | xargs etags .PHONY: 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*' -RSYNC_EXCLUDES := --exclude .svn --exclude CVS --exclude '*~' --exclude TAGS $(LOCAL_RSYNC_EXCLUDES) +LOCAL_RSYNC_EXCLUDES := --exclude '*.pyc' --exclude 'arg*' --exclude LocalTestResources.py +RSYNC_EXCLUDES := --exclude .git --exclude CVS --exclude '*~' --exclude TAGS $(LOCAL_RSYNC_EXCLUDES) RSYNC_COND_DRY_RUN := $(if $(findstring n,$(MAKEFLAGS)),--dry-run,) 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