Mercurial > hg > release > thermostat-0.9
changeset 756:998a0bc94088
Optionally run Eclipse tests with VNC
This commit adds a USE_VNC option to the Makefile. When set to true, the
build will start a VNC server for the Eclipse tests. This will prevent
the Eclipse workbench from popping up during the Eclipse client tests.
Reviewed-by: jerboaa
Review-thread: http://icedtea.classpath.org/pipermail/thermostat/2012-October/003978.html
| author | Elliott Baron <ebaron@redhat.com> |
|---|---|
| date | Tue, 30 Oct 2012 09:11:50 -0400 |
| parents | dfdd139397b6 |
| children | 1d2dd10ff10d |
| files | Makefile |
| diffstat | 1 files changed, 15 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile Mon Oct 29 18:42:49 2012 +0100 +++ b/Makefile Tue Oct 30 09:11:50 2012 -0400 @@ -2,6 +2,10 @@ SKIP_TESTS ?= false REPO_LOC ?= $(HOME)/.thermostat/.build/mvn_repository MAVEN_FLAGS ?= +USE_VNC ?= false +VNC ?= vncserver +VNC_DISPLAY ?= :10 +VNC_FLAGS ?= -SecurityTypes None # # Do not change anything below @@ -14,6 +18,10 @@ MAVEN_SKIP_TEST = -Dmaven.test.skip=true endif +ifeq ($(USE_VNC),true) + DISPLAY = $(VNC_DISPLAY) +endif + # Default to cleaning the local repo and building core + eclipse # Cleaning the repo prevents things like not seeing build failures # after bundles have been renamed. @@ -38,7 +46,13 @@ $(MAVEN) -f eclipse/jfreechart-p2-repository/pom.xml $(MAVEN_FLAGS) $(REPO_FLAG) $(MAVEN_SKIP_TEST) clean $(GOAL) eclipse: eclipse-test-p2 jfreechart-p2 - $(MAVEN) -f eclipse/pom.xml $(MAVEN_FLAGS) $(REPO_FLAG) $(MAVEN_SKIP_TEST) clean $(GOAL) +ifeq ($(USE_VNC),true) + $(VNC) $(VNC_DISPLAY) $(VNC_FLAGS) +endif + -$(MAVEN) -f eclipse/pom.xml $(MAVEN_FLAGS) $(REPO_FLAG) $(MAVEN_SKIP_TEST) clean $(GOAL) +ifeq ($(USE_VNC),true) + $(VNC) -kill $(VNC_DISPLAY) +endif create-repo-dir: mkdir -p $(REPO_LOC)