Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephan Herrmann2013-02-23 11:29:56 +0000
committerStephan Herrmann2013-02-23 11:29:56 +0000
commit56428e9a8fde4e235a917bf1467954b8c62d19f3 (patch)
tree15dab2081bb21f6490f26b28bd8be560ebecaf22
parent00b56bcf521015e6afc011172c68045a206f5ee6 (diff)
downloadorg.eclipse.objectteams-56428e9a8fde4e235a917bf1467954b8c62d19f3.tar.gz
org.eclipse.objectteams-56428e9a8fde4e235a917bf1467954b8c62d19f3.tar.xz
org.eclipse.objectteams-56428e9a8fde4e235a917bf1467954b8c62d19f3.zip
Temp-dir configuration a la Bug 401389 - Should specify our own
-Djava.io.tmpdir for our JUnit tests
-rw-r--r--releng/build-scripts/build/otdt_prerequisites.sh5
-rwxr-xr-xreleng/build-scripts/build/otdt_runtests.sh10
-rw-r--r--releng/build-scripts/build/run.xml4
-rw-r--r--releng/build-scripts/build/test.xml2
4 files changed, 18 insertions, 3 deletions
diff --git a/releng/build-scripts/build/otdt_prerequisites.sh b/releng/build-scripts/build/otdt_prerequisites.sh
index 75db6b805..a108d9c96 100644
--- a/releng/build-scripts/build/otdt_prerequisites.sh
+++ b/releng/build-scripts/build/otdt_prerequisites.sh
@@ -20,6 +20,9 @@ OT_TESTSUITE_DIR=${BASEDIR}/testrun
# EXPORT: tmp directory for logging:
TMPDIR="${BASEDIR}/tmp"
+# EXPORT: tmp directory for test files:
+TEST_TMPDIR="${HOME}/tmp"
+
# EXPORT: directory for metadata from previous builds:
METADATA="${BASEDIR}/metadata"
@@ -62,5 +65,5 @@ ECLIPSE_SDK_TGZ=${DROP}/eclipse-SDK-${EVERSION}-linux-gtk-${ARCH}.tar.gz
ECLIPSE_TESTLIB_ZIP=${DROP}/eclipse-test-framework-${EVERSION}.zip
# EXPORT: where to find previously published plugins&features:
-PUBLISHED_UPDATES=${HOME}/downloads/objectteams/updates/ot2.1
+PUBLISHED_UPDATES=${HOME}/downloads/objectteams/updates/ot2.2
diff --git a/releng/build-scripts/build/otdt_runtests.sh b/releng/build-scripts/build/otdt_runtests.sh
index 58fc31023..544a95927 100755
--- a/releng/build-scripts/build/otdt_runtests.sh
+++ b/releng/build-scripts/build/otdt_runtests.sh
@@ -15,6 +15,7 @@
# INPUT: Variables from otdt_prerequisites:
# -----------------------------------------------------------------------------
# TMPDIR for log output
+# TEST_TMPDIR for temp test files
# OT_TESTSUITE_DIR root directory for building and testing
# METADATA directory for metadata from previous builds
# OT_RECIPIENT mail address for failure messages
@@ -90,6 +91,7 @@ DO_RUN="true"
#LOCAL: Display to be used by VNC:
VNC_DISPLAY=:23
+
while test $# -gt 0; do
case "$1" in
-b)
@@ -105,6 +107,11 @@ while test $# -gt 0; do
X11=X11
shift
;;
+ -tmp)
+ shift
+ TEST_TMPDIR="$1"
+ shift
+ ;;
*)
echo "Unknown argument: $1"
usage
@@ -144,7 +151,8 @@ ANT_OPTIONS="${ANT_PROFILE} \
-Declipse.tests.zip=${ECLIPSE_TESTLIB_ZIP} \
-Dpublished.updates=${PUBLISHED_UPDATES} \
-Ddo.run.tests=${DO_RUN} \
- -Ddo.build.all=${DO_BUILD}"
+ -Ddo.build.all=${DO_BUILD} \
+ -Dtest.tmpDir=${TEST_TMPDIR}"
ANT_OPTS="-Xmx1024m"
export ANT_OPTS
diff --git a/releng/build-scripts/build/run.xml b/releng/build-scripts/build/run.xml
index 2d709e71e..7f9bd21cd 100644
--- a/releng/build-scripts/build/run.xml
+++ b/releng/build-scripts/build/run.xml
@@ -25,6 +25,8 @@ should sources be built (true|false)?
do.build.all = ${do.build.all}
should test be run (true|false)?
do.run.tests = ${do.run.tests}
+directory for tempory files during testing:
+ test.tmpDir = ${test.tmpDir}
------------------------------------------------------------------------------
</echo>
</target>
@@ -343,6 +345,7 @@ should test be run (true|false)?
<property name="basearch" value="${arch}" />
<property name="otdtUpdatesDir" value="${otdtUpdatesDir}" />
<property name="testsUpdatesDirBase" value="${testsUpdatesDirBase}" />
+ <property name="test.tmpDir" value="${test.tmpDir}"/>
<property name="vmargs" value="${vmargs}" />
</ant>
</target>
@@ -357,6 +360,7 @@ should test be run (true|false)?
<property name="basearch" value="${arch}" />
<property name="otdtUpdatesDir" value="${otdtUpdatesDir}" />
<property name="testsUpdatesDirBase" value="${testsUpdatesDirBase}" />
+ <property name="test.tmpDir" value="${test.tmpDir}"/>
<property name="vmargs" value="${vmargs}" />
</ant>
</target>
diff --git a/releng/build-scripts/build/test.xml b/releng/build-scripts/build/test.xml
index b5597d951..e89f0a2ed 100644
--- a/releng/build-scripts/build/test.xml
+++ b/releng/build-scripts/build/test.xml
@@ -59,7 +59,7 @@
>
<ant antfile="plugins/${testPlugin}/test.xml" dir="${test.eclipseDir}">
<property name="eclipse-home" value="${test.eclipseDir}" />
- <property name="extraVMargs" value="-XX:MaxPermSize=320m -XX:+HeapDumpOnOutOfMemoryError"/>
+ <property name="extraVMargs" value="-XX:MaxPermSize=320m -XX:+HeapDumpOnOutOfMemoryError -Djava.io.tmpdir=${test.tmpDir}"/>
</ant>
</target>

Back to the top