more macros

[tests.git] / system / Makefile

diff --git a/system/Makefile b/system/Makefile
index b3b9f64..61be534 100644 (file)
--- 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.onelab.eu 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