This commit is contained in:
parent
bf5d089521
commit
d1db955fba
@ -941,7 +941,7 @@ PARALLEL_BUILD=
|
|||||||
if test -n "$lo_jobs" ; then
|
if test -n "$lo_jobs" ; then
|
||||||
PARALLEL_BUILD="--with-parallelism=$lo_jobs"
|
PARALLEL_BUILD="--with-parallelism=$lo_jobs"
|
||||||
fi
|
fi
|
||||||
# make %{?_smp_mflags} sure that JAVA_HOME is set correctly
|
# make sure that JAVA_HOME is set correctly
|
||||||
source %{_sysconfdir}/profile.d/alljava.sh
|
source %{_sysconfdir}/profile.d/alljava.sh
|
||||||
# use RPM_OPT_FLAGS, ...
|
# use RPM_OPT_FLAGS, ...
|
||||||
# remove big debugsymbols as we simply consume too much space
|
# remove big debugsymbols as we simply consume too much space
|
||||||
@ -1039,20 +1039,20 @@ export NOCONFIGURE=yes
|
|||||||
--with-gdrive-client-id="${google_default_client_id}"
|
--with-gdrive-client-id="${google_default_client_id}"
|
||||||
# no coinormp packages for coinmp
|
# no coinormp packages for coinmp
|
||||||
|
|
||||||
# just call make %{?_smp_mflags} here as we added the jobs in configure
|
# just call make here as we added the jobs in configure
|
||||||
# The check phase is run here too if it is split with nocheck
|
# The check phase is run here too if it is split with nocheck
|
||||||
# install of jars get broken sometimes
|
# install of jars get broken sometimes
|
||||||
make %{?_smp_mflags} verbose=true build-nocheck
|
make verbose=true build-nocheck
|
||||||
|
|
||||||
%check
|
%check
|
||||||
# Run tests only on 64b intel as they are resource hogs
|
# Run tests only on 64b intel as they are resource hogs
|
||||||
%ifarch x86_64
|
%ifarch x86_64
|
||||||
make %{?_smp_mflags}
|
make
|
||||||
unset WITH_LANG
|
unset WITH_LANG
|
||||||
# work around flawed accessibility check
|
# work around flawed accessibility check
|
||||||
export JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY="1"
|
export JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY="1"
|
||||||
export OOO_TEST_SOFFICE=path:%{buildroot}%{baseinstdir}/program/soffice
|
export OOO_TEST_SOFFICE=path:%{buildroot}%{baseinstdir}/program/soffice
|
||||||
#timeout -k 2m 2h make %{?_smp_mflags} smoketest.subsequentcheck
|
#timeout -k 2m 2h make smoketest.subsequentcheck
|
||||||
# we don't need this anymore
|
# we don't need this anymore
|
||||||
rm -f %{buildroot}%{baseinstdir}/program/classes/smoketest.jar
|
rm -f %{buildroot}%{baseinstdir}/program/classes/smoketest.jar
|
||||||
%endif
|
%endif
|
||||||
|
Loading…
x
Reference in New Issue
Block a user