From ab896185ae9dfe9a6f9f61f73cc85975bca5ef7d Mon Sep 17 00:00:00 2001 From: Daniel Narvaez Date: Thu, 02 Aug 2012 16:50:31 +0000 Subject: Use the start-sugar script for run --- (limited to 'Makefile') diff --git a/Makefile b/Makefile index 33ac324..0ad7a6e 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,6 @@ LOGFILE = $(CURDIR)/logs/build-$(TIMESTAMP).log SCRIPTS = $(CURDIR)/scripts JHBUILD = $(CURDIR)/install/bin/jhbuild -f $(SCRIPTS)/jhbuildrc LOG = $(SCRIPTS)/log-command -XINITDISPLAY = `$(SCRIPTS)/find-free-display` # The buildbot shell does not handle script properly. It's unnecessary # anyway because we can't use interactive scripts there. @@ -50,7 +49,7 @@ build-%: $(TYPESCRIPT) "$(JHBUILD) buildone $*" $(LOGFILE) run: x11-utils - xinit $(SCRIPTS)/xinitrc -- $(XINITDISPLAY) &>>$(LOGFILE) + $(SCRIPTS)/shell/start-sugar test: x11-utils $(LOG) "$(SCRIPTS)/run-dogtail-tests" $(LOGFILE) -- cgit v0.9.1