Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorspingel2008-12-15 02:33:54 +0000
committerspingel2008-12-15 02:33:54 +0000
commita5cee8f4735d9bd01928585ec358aa210157c57d (patch)
tree846beeda9fa35d42907de4ad5af54d7ff8aa399f
parente7852202faaa407df1ca7e476bc006f5e5811dc8 (diff)
downloadorg.eclipse.mylyn-a5cee8f4735d9bd01928585ec358aa210157c57d.tar.gz
org.eclipse.mylyn-a5cee8f4735d9bd01928585ec358aa210157c57d.tar.xz
org.eclipse.mylyn-a5cee8f4735d9bd01928585ec358aa210157c57d.zip
NEW - bug 257972: fix standalone tests
https://bugs.eclipse.org/bugs/show_bug.cgi?id=257972
-rw-r--r--org.eclipse.mylyn.releng/build.xml10
-rw-r--r--org.eclipse.mylyn.releng/defaults.properties1
2 files changed, 7 insertions, 4 deletions
diff --git a/org.eclipse.mylyn.releng/build.xml b/org.eclipse.mylyn.releng/build.xml
index 9c85706e..dc5e90f9 100644
--- a/org.eclipse.mylyn.releng/build.xml
+++ b/org.eclipse.mylyn.releng/build.xml
@@ -39,11 +39,12 @@
<property name="log" value="${build.results}/test-standalone-${build.target}.log" />
<path id="tests.classpath">
<fileset dir="${install.dir}">
- <include name="plugins/*.jar"/>
- <include name="plugins/*/*.jar"/>
+ <include name="plugins/**/*.jar"/>
+ <exclude name="plugins/**/ui*.jar"/>
</fileset>
<dirset dir="${install.dir}/plugins">
<include name="*"/>
+ <exclude name="*ui*"/>
</dirset>
<fileset dir="${eclipse.home}/plugins">
<include name="org.junit_*/junit.jar"/>
@@ -67,6 +68,7 @@
<classpath>
<path refid="tests.classpath"/>
</classpath>
+ <sysproperty key="mylyn.credentials" value="${build.credentials}"/>
<formatter type="xml" />
<test todir="${output.dir}" name="org.eclipse.mylyn.tests.AllHeadlessStandaloneTests"/>
</junit>
@@ -142,8 +144,8 @@
<target name="publish-helper-run">
<path id="file.id">
- <fileset dir="${build.results}/test-${build.target}">
- <include name="${file}"/>
+ <fileset dir="${build.results}">
+ <include name="test-${build.target}/${file}"/>
</fileset>
</path>
<property name="file.path" refid="file.id"/>
diff --git a/org.eclipse.mylyn.releng/defaults.properties b/org.eclipse.mylyn.releng/defaults.properties
index 88a02eca..990b791a 100644
--- a/org.eclipse.mylyn.releng/defaults.properties
+++ b/org.eclipse.mylyn.releng/defaults.properties
@@ -26,6 +26,7 @@ build.reporter.jvm=${java.home}/bin/java
build.results=${basedir}/build-results
# test parameter
+build.credentials=${basedir}/credentials.properties
build.host=default
build.assertAgainst=v20080619-1900
build.baseline=3.0_${build.assertAgainst}-${build.assertAgainst}

Back to the top