Makefile.top | 2 +-
config_host.mk.in | 1 +
configure.in | 17 +++++++++++++++++
3 files changed, 19 insertions(+), 1 deletion(-)
New commits:
commit 3ee97489ea49b339c4a7578afd85f85f77dd0f68
Author: Noel Grandin <noelgran...@gmail.com>
Date: Tue Aug 28 07:00:18 2012 +0200
allow separate setting of parallelism for subseq. tests
Change-Id: I5a5444e8ee95b0fd95a97c31c94ab0f9c3935abb
diff --git a/Makefile.top b/Makefile.top
index 643bcbb..a387e53 100644
--- a/Makefile.top
+++ b/Makefile.top
@@ -271,7 +271,7 @@ $(1).clean:
cd $(1) && $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) clean
gb_PARTIALBUILD=T
$(1).subsequentcheck:
- cd $(1) && $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS)
subsequentcheck gb_PARTIALBUILD=T
+ cd $(1) && $(GNUMAKE) -j $(CHECK_PARALLELISM) $(GMAKE_OPTIONS)
subsequentcheck gb_PARTIALBUILD=T
$(1).deliver:
@true
diff --git a/config_host.mk.in b/config_host.mk.in
index 6da79d1..a2404f7 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -46,6 +46,7 @@ export CC=@CC@
export CC_FOR_BUILD=@CC_FOR_BUILD@
export CDR_CFLAGS=@CDR_CFLAGS@
export CDR_LIBS=@CDR_LIBS@
+export CHECK_PARALLELISM=@CHECK_PARALLELISM@
export CLASSPATH=@CLASSPATH@
export CL_X64=@CL_X64@
export CLUCENE_CFLAGS=@CLUCENE_CFLAGS@
diff --git a/configure.in b/configure.in
index db28504..51c1ff2 100644
--- a/configure.in
+++ b/configure.in
@@ -2068,6 +2068,12 @@ AC_ARG_WITH(max-jobs,
Defaults to 1, unless you configure --enable-icecream - then to 10.]),
,)
+AC_ARG_WITH(check-jobs,
+ AS_HELP_STRING([--with-check-jobs],
+ [Maximum number of jobs that will be issued at the same time during
'make subsequenttest'.
+ Default value is the same as 'max-jobs'. Useful because the
subsequent tests are very lighweight.]),
+,)
+
dnl ===================================================================
dnl MacOSX build and runtime environment options
dnl ===================================================================
@@ -12166,6 +12172,17 @@ AC_SUBST(GMAKE_PARALLELISM)
AC_SUBST(GMAKE_MODULE_PARALLELISM)
dnl ===================================================================
+dnl Number of parallel jobs to be executed during subsequenttest
+dnl ===================================================================
+AC_MSG_CHECKING([for maximum no. of jobs during subsequenttest])
+CHECK_PARALLELISM=$GMAKE_PARALLELISM
+if test "$with_check_jobs" != ""; then
+ CHECK_PARALLELISM="$with_check_jobs"
+fi
+AC_MSG_RESULT([$CHECK_PARALLELISM])
+AC_SUBST(CHECK_PARALLELISM)
+
+dnl ===================================================================
dnl Setting up the environment.
dnl ===================================================================
echo "setting up the build environment variables..."
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
