mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

allow separate setting of parallelism for subseq. tests

Browse Source 
Change-Id: I5a5444e8ee95b0fd95a97c31c94ab0f9c3935abb
This commit is contained in:
Noel Grandin
2012-08-28 07:00:18 +02:00
committed by David Tardon
parent 85e40d787e
commit 3ee97489ea
3 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.top
View File

@@ -271,7 +271,7 @@ $(1).clean:
cd $(1) && $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) clean gb_PARTIALBUILD=T cd $(1) && $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) clean gb_PARTIALBUILD=T
$(1).subsequentcheck: $(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: $(1).deliver:
@true @true

1
config_host.mk.in
View File

@@ -46,6 +46,7 @@ export CC=@CC@
export CC_FOR_BUILD=@CC_FOR_BUILD@ export CC_FOR_BUILD=@CC_FOR_BUILD@
export CDR_CFLAGS=@CDR_CFLAGS@ export CDR_CFLAGS=@CDR_CFLAGS@
export CDR_LIBS=@CDR_LIBS@ export CDR_LIBS=@CDR_LIBS@
export CHECK_PARALLELISM=@CHECK_PARALLELISM@
export CLASSPATH=@CLASSPATH@ export CLASSPATH=@CLASSPATH@
export CL_X64=@CL_X64@ export CL_X64=@CL_X64@
export CLUCENE_CFLAGS=@CLUCENE_CFLAGS@ export CLUCENE_CFLAGS=@CLUCENE_CFLAGS@

17
configure.in
View File

@@ -2068,6 +2068,12 @@ AC_ARG_WITH(max-jobs,
Defaults to 1, unless you configure --enable-icecream - then to 10.]), 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 ===================================================================
dnl MacOSX build and runtime environment options dnl MacOSX build and runtime environment options
dnl =================================================================== dnl ===================================================================
@@ -12165,6 +12171,17 @@ AC_MSG_RESULT([per module:$GMAKE_MODULE_PARALLELISM, for tail_build:$GMAKE_PARAL
AC_SUBST(GMAKE_PARALLELISM) AC_SUBST(GMAKE_PARALLELISM)
AC_SUBST(GMAKE_MODULE_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 ===================================================================
dnl Setting up the environment. dnl Setting up the environment.
dnl =================================================================== dnl ===================================================================