diff options
author | Caolán McNamara <caolanm@redhat.com> | 2010-12-02 14:06:21 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2010-12-02 14:06:21 +0000 |
commit | 2935731635e0decc1a2a4790da1cec894a392a77 (patch) | |
tree | 262564c06f24be5639ba034aacdd41737381330f | |
parent | c29941f4b94a68035fe5bbf3167da73302d2bc08 (diff) |
make smoketest use ooinstal to build its install set
-rw-r--r-- | Makefile.in | 8 | ||||
-rw-r--r-- | set_soenv.in | 1 |
2 files changed, 8 insertions, 1 deletions
diff --git a/Makefile.in b/Makefile.in index 10b003e5d..9e05c7059 100644 --- a/Makefile.in +++ b/Makefile.in @@ -6,7 +6,7 @@ SHELL=/bin/sh all: dmake/dmake@EXEEXT@ fetch @. ./*[Ee]nv.[Ss]et.sh && \ cd instsetoo_native && \ - ../solenv/bin/build.pl -P@BUILD_NCPUS@ --all -- -P@BUILD_MAX_JOBS@ + build.pl -P@BUILD_NCPUS@ --all -- -P@BUILD_MAX_JOBS@ install: @. ./*[Ee]nv.[Ss]et.sh && \ @@ -40,3 +40,9 @@ src/downloaded: ooo.lst download $$SRC_ROOT/download $$SRC_ROOT/ooo.lst && touch $@ fetch: src/downloaded + +check: + @. ./*[Ee]nv.[Ss]et.sh && \ + cd smoketestoo_native && \ + export SAL_USE_VCLPLUGIN="svp" && \ + build.pl -P@BUILD_NCPUS@ --all -- -P@BUILD_MAX_JOBS@ diff --git a/set_soenv.in b/set_soenv.in index 464056e6d..2c56a4dd8 100644 --- a/set_soenv.in +++ b/set_soenv.in @@ -2167,6 +2167,7 @@ print "*********************************************************". print "To build, issue:\nmake\n\n"; print "To install when the build is finished, issue:\nmake install\n\n"; print "If you want to develop LibreOffice, you might prefer:\nmake dev-install\n\n"; +print "If you want to run the smoketest, issue:\nmake check\n\n"; $bootfile = "bootstrap"; open( OUT, ">$bootfile" ) || |