diff options
| author | Daniel Narvaez <dwnarvaez@gmail.com> | 2012-08-07 11:40:38 (GMT) |
|---|---|---|
| committer | Daniel Narvaez <dwnarvaez@gmail.com> | 2012-08-07 11:40:38 (GMT) |
| commit | f4324ad8bff1e1fb6594d599c5aa8b2149621cd2 (patch) | |
| tree | a1a5779aed2285a785eae75572ac6ddd971d05f3 /Makefile | |
| parent | e7a33e537d1ea5432cdc17aadfb07f33efd7037f (diff) | |
| parent | 82a3c0e889de4974e49bdf5ce8f950ebcfdb201b (diff) | |
Merge branch 'master' of git.sugarlabs.org:sugar-build/sugar-build
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -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) |