X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=system%2FMakefile;h=61be534550c7a40a5becabbd3910b4f01043586e;hb=ad834ec7b976049bbd88beb85559dda440eda57c;hp=6218052b0836a1906572d43329f6af7b6bef2ca5;hpb=d6e15e821562d9efc2157b9d0ac60404fbfdda73;p=tests.git

diff --git a/system/Makefile b/system/Makefile
index 6218052..61be534 100644
--- a/system/Makefile
+++ b/system/Makefile
@@ -1,29 +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 TESTMASTER=hostname BUILDNAME=vservername
-ifdef TESTMASTER
-ifdef BUILDNAME
-PLCSSH:=root@$(TESTMASTER):$(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 TESTMASTER and BUILDNAME on the command line"
-	echo " e.g. make sync TESTMASTER=testmaster.onelab.eu BUILDNAME=2009.07.10--1l-f8-32" ; 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
-
-
-