X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=system%2FMakefile;h=61be534550c7a40a5becabbd3910b4f01043586e;hb=9e5cba850b98b3b1fb5c9f51b94523eb29689d98;hp=10f206387561a75b3148ae025fd83be962f2ae53;hpb=560938db174121e93854fd39b66d29be86769864;p=tests.git

diff --git a/system/Makefile b/system/Makefile
index 10f2063..61be534 100644
--- a/system/Makefile
+++ b/system/Makefile
@@ -1,16 +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
 
-LOCAL_RSYNC_EXCLUDES	:= --exclude '*.pyc' --exclude 'arg*' 
-RSYNC_EXCLUDES		:= --exclude .svn --exclude CVS --exclude '*~' --exclude TAGS $(LOCAL_RSYNC_EXCLUDES)
+####################
+
+TESTMASTER ?= testmaster.onelab.eu
+
+########## make sync TESTMASTER=hostname BUILD=vservername
+ifdef BUILD
+PLCSSH:=root@$(TESTMASTER):$(BUILD)
+endif
+
+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 (,$(RSYNC_URL))
-	echo "sync: You must define target host as RSYNC_URL on the command line"
-	echo " e.g. make sync RSYNC_URL=root@testbox1:workdir" ; exit 1
+ifeq (,$(PLCSSH))
+	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) ./ $(RSYNC_URL)/
+	+$(RSYNC) ./ $(PLCSSH)
 endif