Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Taal2015-12-07 08:05:17 -0500
committerMartin Taal2015-12-07 08:05:17 -0500
commitf13c027fbe0fa5fefb191889eb4e67ac0ce3eed5 (patch)
treeb38471d80f4774155f856e8d46f3af477aad95c0
parent7a80217cf46dc8ab27d052cd70f582aae603a21c (diff)
downloadorg.eclipse.emf.texo-f13c027fbe0fa5fefb191889eb4e67ac0ce3eed5.tar.gz
org.eclipse.emf.texo-f13c027fbe0fa5fefb191889eb4e67ac0ce3eed5.tar.xz
org.eclipse.emf.texo-f13c027fbe0fa5fefb191889eb4e67ac0ce3eed5.zip
Define temporary path explicitly in jvm arg
-rw-r--r--core/org.eclipse.emf.texo/src/org/eclipse/emf/texo/store/TexoEMFResourceURIConverter.java3
-rw-r--r--infra/org.eclipse.emf.texo.releng.buckminster/build.xml4
-rw-r--r--infra/org.eclipse.emf.texo.releng.buckminster/test/texo_test.xml1
-rw-r--r--tests/org.eclipse.emf.texo.server.test/src/org/eclipse/emf/texo/server/test/ws/EMFResourceObjectStoreWSTest.java4
4 files changed, 12 insertions, 0 deletions
diff --git a/core/org.eclipse.emf.texo/src/org/eclipse/emf/texo/store/TexoEMFResourceURIConverter.java b/core/org.eclipse.emf.texo/src/org/eclipse/emf/texo/store/TexoEMFResourceURIConverter.java
index 1f64e499..519da816 100644
--- a/core/org.eclipse.emf.texo/src/org/eclipse/emf/texo/store/TexoEMFResourceURIConverter.java
+++ b/core/org.eclipse.emf.texo/src/org/eclipse/emf/texo/store/TexoEMFResourceURIConverter.java
@@ -60,6 +60,9 @@ public class TexoEMFResourceURIConverter extends ExtensibleURIConverterImpl impl
*/
protected String getTemporaryDirectoryPath() {
try {
+ if (System.getProperty("texo.temp.directory") != null) { //$NON-NLS-1$
+ return System.getProperty("texo.temp.directory");//$NON-NLS-1$
+ }
final File f = File.createTempFile("test" + System.currentTimeMillis(), null); //$NON-NLS-1$
String tempDirectory = f.getParentFile().getAbsolutePath();
f.delete();
diff --git a/infra/org.eclipse.emf.texo.releng.buckminster/build.xml b/infra/org.eclipse.emf.texo.releng.buckminster/build.xml
index e643d5ff..f3943853 100644
--- a/infra/org.eclipse.emf.texo.releng.buckminster/build.xml
+++ b/infra/org.eclipse.emf.texo.releng.buckminster/build.xml
@@ -58,6 +58,7 @@ http://dev.eclipse.org/viewsvn/index.cgi/trunk/org.eclipse.buckminster.releng/bu
</condition>
<property name="buildsPath" location="${hudsonWorkSpacePath}/build" />
+ <property name="tempPath" location="${buildsPath}/temp" />
<property name="resultP2Site" location="/jobs/genie.texo/emft-texo-nightly/lastSuccessful/archive/build/result/p2site" />
<property name="gitPath" location="${hudsonWorkSpacePath}/git" />
@@ -144,6 +145,7 @@ http://dev.eclipse.org/viewsvn/index.cgi/trunk/org.eclipse.buckminster.releng/bu
<target name="init">
<echo message="Removing old build" />
<delete dir="${testPath}" quiet="true" />
+ <delete dir="${tempPath}" quiet="true" />
<delete dir="${buildPath}" quiet="true" />
<delete dir="${generatePath}" quiet="true" />
<delete dir="${promotePath}" quiet="true" />
@@ -154,6 +156,7 @@ http://dev.eclipse.org/viewsvn/index.cgi/trunk/org.eclipse.buckminster.releng/bu
<echo message="Creating main directories" />
<echo message="rootPath: ${rootPath}" />
<echo message="buildPath: ${buildPath}" />
+ <echo message="tempPath: ${tempPath}" />
<echo message="testPath: ${testPath}" />
<echo message="buildSitePath: ${buildSitePath}" />
<echo message="buildZipsPath: ${buildZipsPath}" />
@@ -161,6 +164,7 @@ http://dev.eclipse.org/viewsvn/index.cgi/trunk/org.eclipse.buckminster.releng/bu
<echo message="mavenPath: ${mavenPath}" />
<mkdir dir="${rootPath}" />
<mkdir dir="${buildPath}" />
+ <mkdir dir="${tempPath}" />
<mkdir dir="${promotePath}" />
<mkdir dir="${mavenPath}" />
<mkdir dir="${testPath}" />
diff --git a/infra/org.eclipse.emf.texo.releng.buckminster/test/texo_test.xml b/infra/org.eclipse.emf.texo.releng.buckminster/test/texo_test.xml
index eed5164f..81d6ea41 100644
--- a/infra/org.eclipse.emf.texo.releng.buckminster/test/texo_test.xml
+++ b/infra/org.eclipse.emf.texo.releng.buckminster/test/texo_test.xml
@@ -75,6 +75,7 @@ http://dev.eclipse.org/viewsvn/index.cgi/trunk/org.eclipse.buckminster.releng/bu
<arg value="--stderr" />
<arg value="${testResultsPath}/stderr.txt" />
<arg value="--flatXML"/>
+ <arg value="-Dtexo.temp.directory=${tempPath}"/>
</cmdargs>
</buckminster>
</target>
diff --git a/tests/org.eclipse.emf.texo.server.test/src/org/eclipse/emf/texo/server/test/ws/EMFResourceObjectStoreWSTest.java b/tests/org.eclipse.emf.texo.server.test/src/org/eclipse/emf/texo/server/test/ws/EMFResourceObjectStoreWSTest.java
index ff042318..c5f03e20 100644
--- a/tests/org.eclipse.emf.texo.server.test/src/org/eclipse/emf/texo/server/test/ws/EMFResourceObjectStoreWSTest.java
+++ b/tests/org.eclipse.emf.texo.server.test/src/org/eclipse/emf/texo/server/test/ws/EMFResourceObjectStoreWSTest.java
@@ -461,6 +461,10 @@ public class EMFResourceObjectStoreWSTest extends BaseWSWebTest {
protected String getTemporaryDirectoryPath() {
try {
+ if (System.getProperty("texo.temp.directory") != null) { //$NON-NLS-1$
+ return System.getProperty("texo.temp.directory");//$NON-NLS-1$
+ }
+
final File f = File.createTempFile("test" + System.currentTimeMillis(), null); //$NON-NLS-1$
String tempDirectory = f.getParentFile().getAbsolutePath();
f.delete();

Back to the top