[SCM] LibreOffice packaging repository branch, ubuntu-raring-4.0, updated. libreoffice_4.0.1_rc1-2-258-gf5e3e6e
The following commit has been merged in the ubuntu-raring-4.0 branch:
commit f5e3e6e16e8bbcdee7c36a4cc95efb4549737a83
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Tue Mar 19 17:09:22 2013 +0100
some decorum for the test
diff --git a/tests/junit-subsequentcheckbase b/tests/junit-subsequentcheckbase
index f59d29d..e8a7ed4 100755
--- a/tests/junit-subsequentcheckbase
+++ b/tests/junit-subsequentcheckbase
@@ -7,18 +7,38 @@ set -e
SRCDIR=`pwd`
WORKDIR=`mktemp -d`
+
+
+echo "====== checking free disc and memory space ======"
+df -h
+free
+
trap "rm -rf ${WORKDIR}" 0 INT QUIT ABRT PIPE TERM
-echo $WORKDIR
# lets get our own copy as we make it dirty
+echo
+echo "====== Copying source from ${SRCDIR} to ${WORKDIR} ======"
cp -a ${SRCDIR} ${WORKDIR}
+
+echo
+echo "====== Changing to directory `ls ${WORKDIR}/*` ======"
cd ${WORKDIR}/*
-# patch the tree to only build Java-based unittests against an existing installation
+echo
+echo "====== Patching the tree to only build Java-based unittests against an existing installation ======"
patch -p1 < ./debian/tests/patches/java-subsequentcheck-standalone.diff
-make clean
+echo
+echo "====== Generating configuration ======="
+rm -f config_host.mk
./debian/rules config_host.mk
+
+echo
+echo "====== Cleaning tree ======"
+make clean 2>&1
+
+echo
+echo "====== Determinating job count ======"
echo "include config_host.mk" > FindDefaultParallelismMakefile
echo "all:" >> FindDefaultParallelismMakefile
echo "\t@echo \$(CHECK_PARALLELISM)" >> FindDefaultParallelismMakefile
@@ -26,13 +46,16 @@ DEFAULT_CHECK_PARALLELISM=`make -f FindDefaultParallelismMakefile`
CHECK_PARALLELISM=${2:-${DEFAULT_CHECK_PARALLELISM}}
OOO_TEST_SOFFICE="${1:-path:/usr/lib/libreoffice/program/soffice}"
+echo
+echo "====== Enabling core dumps ======"
# yes, we want core dumps and stack traces
ulimit -c unlimited
-echo "Starting subsequentcheck with ${CHECK_PARALLELISM} job against ${OOO_TEST_SOFFICE}"
+echo
+echo "====== Starting subsequentcheck with ${CHECK_PARALLELISM} job against ${OOO_TEST_SOFFICE} ======"
make -rkj ${CHECK_PARALLELISM} \
-f Makefile.post \
OOO_TEST_SOFFICE=${OOO_TEST_SOFFICE} \
bridges_SELECTED_BRIDGE=foo \
- subsequentcheck
+ subsequentcheck 2>&1
--
LibreOffice packaging repository
Reply to: