[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/eclipse-tests/FC-4 eclipse-tests-directories.patch, NONE, 1.1 eclipse-tests-library.xml.patch, NONE, 1.1 eclipse-tests-runtests.patch, NONE, 1.1 eclipse-tests-test.xml.patch, NONE, 1.1 eclipse-tests.spec, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 eclipse-tests-3.0.spec, 1.1, NONE eclipse-tests-directories.3.0.patch, 1.1, NONE eclipse-tests-library.xml.3.0.patch, 1.1, NONE eclipse-tests-runtests.3.0.patch, 1.1, NONE eclipse-tests-test.xml.3.0.patch, 1.1, NONE



Author: overholt

Update of /cvs/dist/rpms/eclipse-tests/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv3243

Modified Files:
	.cvsignore sources 
Added Files:
	eclipse-tests-directories.patch 
	eclipse-tests-library.xml.patch eclipse-tests-runtests.patch 
	eclipse-tests-test.xml.patch eclipse-tests.spec 
Removed Files:
	eclipse-tests-3.0.spec eclipse-tests-directories.3.0.patch 
	eclipse-tests-library.xml.3.0.patch 
	eclipse-tests-runtests.3.0.patch 
	eclipse-tests-test.xml.3.0.patch 
Log Message:
Remove "3.1" from patches and specfile.


eclipse-tests-directories.patch:
 org.eclipse.ant.tests.core_3.1.0/test.xml                |    4 ++--
 org.eclipse.ant.tests.ui_3.1.0/test.xml                  |    6 +++---
 org.eclipse.compare.tests_3.1.0/test.xml                 |    6 +++---
 org.eclipse.core.expressions.tests_3.1.0/test.xml        |    4 ++--
 org.eclipse.core.filebuffers.tests_3.1.0/test.xml        |    4 ++--
 org.eclipse.core.tests.harness_3.1.0/test.xml            |    8 ++++----
 org.eclipse.help.tests_3.1.0/test.xml                    |    4 ++--
 org.eclipse.jdt.core.tests.builder_3.1.0/test.xml        |    2 +-
 org.eclipse.jdt.core.tests.compiler_3.1.0/test.xml       |    8 ++++----
 org.eclipse.jdt.core.tests.model_3.1.0/test.xml          |    8 ++++----
 org.eclipse.jdt.core.tests.performance_3.1.0/test.xml    |    6 +++---
 org.eclipse.jdt.debug.tests_3.1.0/test.xml               |    6 +++---
 org.eclipse.jdt.text.tests_3.1.0/test.xml                |    6 +++---
 org.eclipse.jdt.ui.tests.refactoring_3.1.0/test.xml      |    6 +++---
 org.eclipse.jdt.ui.tests_3.1.0/test.xml                  |    8 ++++----
 org.eclipse.jface.text.tests_3.1.0/test.xml              |    4 ++--
 org.eclipse.ltk.core.refactoring.tests_3.1.0/test.xml    |    4 ++--
 org.eclipse.ltk.ui.refactoring.tests_3.1.0/test.xml      |    4 ++--
 org.eclipse.pde.ui.tests_3.1.0/test.xml                  |    6 +++---
 org.eclipse.releng.tests_3.1.0/test.xml                  |    2 +-
 org.eclipse.swt.tests_3.1.0/test.xml                     |    6 +++---
 org.eclipse.team.tests.core_3.1.0/test.xml               |    2 +-
 org.eclipse.team.tests.cvs.core_3.1.0/test.xml           |    4 ++--
 org.eclipse.text.tests_3.1.0/test.xml                    |    4 ++--
 org.eclipse.ui.editors.tests_3.1.0/test.xml              |    4 ++--
 org.eclipse.ui.tests.rcp_3.1.0/test.xml                  |    6 +++---
 org.eclipse.ui.tests_3.1.0/test.xml                      |   10 +++++-----
 org.eclipse.ui.workbench.texteditor.tests_3.1.0/test.xml |    4 ++--
 org.eclipse.update.tests.core_3.1.0/test.xml             |    8 ++++----
 29 files changed, 77 insertions(+), 77 deletions(-)

--- NEW FILE eclipse-tests-directories.patch ---
diff -uNr plugins.orig/org.eclipse.ant.tests.core_3.1.0/test.xml plugins/org.eclipse.ant.tests.core_3.1.0/test.xml
--- plugins.orig/org.eclipse.ant.tests.core_3.1.0/test.xml	2005-07-12 15:38:07.000000000 -0400
+++ plugins/org.eclipse.ant.tests.core_3.1.0/test.xml	2005-07-12 15:41:47.000000000 -0400
@@ -15,14 +15,14 @@
   <target name="init">
     <tstamp/>
     <delete>
-      <fileset dir="${eclipse-home}" includes="org*.xml"/>
+      <fileset dir="${data-dir}" includes="org*.xml"/>
     </delete>
   </target>
 
   <!-- This target defines the tests that need to be run. -->
   <target name="suite">
     <property name="jdt-folder" 
-              value="${eclipse-home}/jdt_folder"/>
+              value="${data-dir}/jdt_folder"/>
     <delete dir="${jdt-folder}" quiet="true"/>
     <ant target="core-test" antfile="${library-file}" dir="${eclipse-home}">
       <property name="data-dir" value="${jdt-folder}"/>
diff -uNr plugins.orig/org.eclipse.ant.tests.ui_3.1.0/test.xml plugins/org.eclipse.ant.tests.ui_3.1.0/test.xml
--- plugins.orig/org.eclipse.ant.tests.ui_3.1.0/test.xml	2005-07-12 15:38:07.000000000 -0400
+++ plugins/org.eclipse.ant.tests.ui_3.1.0/test.xml	2005-07-12 15:41:47.000000000 -0400
@@ -15,14 +15,14 @@
   <target name="init">
     <tstamp/>
     <delete>
-      <fileset dir="${eclipse-home}" includes="org*.xml"/>
+      <fileset dir="${data-dir}" includes="org*.xml"/>
     </delete>
   </target>
 
   <!-- This target defines the tests that need to be run. -->
   <target name="suite">
     <property name="jdt-folder" 
-              value="${eclipse-home}/jdt_folder"/>
+              value="${data-dir}/jdt_folder"/>
     <delete dir="${jdt-folder}" quiet="true"/>
     <ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
       <property name="data-dir" value="${jdt-folder}"/>
@@ -35,7 +35,7 @@
  <!-- This target defines the performance tests that need to be run. -->
 	  <target name="perfsuite">
 	    <property name="jdt-folder" 
-	              value="${eclipse-home}/jdt_folder"/>
+	              value="${data-dir}/jdt_folder"/>
 	    <delete dir="${jdt-folder}" quiet="true"/>
 	    <ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
 	      <property name="data-dir" value="${jdt-folder}"/>
diff -uNr plugins.orig/org.eclipse.compare.tests_3.1.0/test.xml plugins/org.eclipse.compare.tests_3.1.0/test.xml
--- plugins.orig/org.eclipse.compare.tests_3.1.0/test.xml	2005-07-12 15:38:07.000000000 -0400
+++ plugins/org.eclipse.compare.tests_3.1.0/test.xml	2005-07-12 15:41:47.000000000 -0400
@@ -15,13 +15,13 @@
   <target name="init">
     <tstamp/>
     <delete>
-      <fileset dir="${eclipse-home}" includes="org*.xml"/>
+      <fileset dir="${data-dir}" includes="org*.xml"/>
     </delete>
   </target>
 
   <!-- This target defines the tests that need to be run. -->
   <target name="suite">
-    <property name="compare-folder" value="${eclipse-home}/compare_folder"/>
+    <property name="compare-folder" value="${data-dir}/compare_folder"/>
     <delete dir="${compare-folder}" quiet="true"/>
     <ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
       <property name="data-dir" value="${compare-folder}"/>
@@ -32,7 +32,7 @@
 
   <!-- This target defines the performance tests that need to be run. -->
   <target name="performance-suite">
-    <property name="compare-performance-folder" value="${eclipse-home}/compare_performance_folder"/>
+    <property name="compare-performance-folder" value="${data-dir}/compare_performance_folder"/>
     <delete dir="${compare-performance-folder}" quiet="true"/>
     <ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
       <property name="data-dir" value="${compare-performance-folder}"/>
diff -uNr plugins.orig/org.eclipse.core.expressions.tests_3.1.0/test.xml plugins/org.eclipse.core.expressions.tests_3.1.0/test.xml
--- plugins.orig/org.eclipse.core.expressions.tests_3.1.0/test.xml	2005-07-12 15:38:07.000000000 -0400
+++ plugins/org.eclipse.core.expressions.tests_3.1.0/test.xml	2005-07-12 15:41:47.000000000 -0400
@@ -16,14 +16,14 @@
   <target name="init">
     <tstamp/>
     <delete>
-      <fileset dir="${eclipse-home}" includes="org*.xml"/>
+      <fileset dir="${data-dir}" includes="org*.xml"/>
     </delete>
   </target>
 
   <!-- This target defines the tests that need to be run. -->
   <target name="suite">
     <property name="expressions-folder" 
-              value="${eclipse-home}/expressions_folder"/>
+              value="${data-dir}/expressions_folder"/>
     <delete dir="${expressions-folder}" quiet="true"/>
     <ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
       <property name="data-dir" value="${expressions-folder}"/>
diff -uNr plugins.orig/org.eclipse.core.filebuffers.tests_3.1.0/test.xml plugins/org.eclipse.core.filebuffers.tests_3.1.0/test.xml
--- plugins.orig/org.eclipse.core.filebuffers.tests_3.1.0/test.xml	2005-07-12 15:38:07.000000000 -0400
+++ plugins/org.eclipse.core.filebuffers.tests_3.1.0/test.xml	2005-07-12 15:41:47.000000000 -0400
@@ -16,14 +16,14 @@
   <target name="init">
     <tstamp/>
     <delete>
-      <fileset dir="${eclipse-home}" includes="org*.xml"/>
+      <fileset dir="${data-dir}" includes="org*.xml"/>
     </delete>
   </target>
 
   <!-- This target defines the tests that need to be run. -->
   <target name="suite">
     <property name="core-filebuffers-folder" 
-              value="${eclipse-home}/core_filebuffers_folder"/>
+              value="${data-dir}/core_filebuffers_folder"/>
     <delete dir="${core-filebuffers-folder}" quiet="true"/>
     <ant target="core-test" antfile="${library-file}" dir="${eclipse-home}">
       <property name="data-dir" value="${core-filebuffers-folder}"/>
diff -uNr plugins.orig/org.eclipse.core.tests.harness_3.1.0/test.xml plugins/org.eclipse.core.tests.harness_3.1.0/test.xml
--- plugins.orig/org.eclipse.core.tests.harness_3.1.0/test.xml	2005-07-12 15:38:07.000000000 -0400
+++ plugins/org.eclipse.core.tests.harness_3.1.0/test.xml	2005-07-12 15:41:47.000000000 -0400
@@ -5,9 +5,9 @@
   <!-- sets the properties eclipse-home, and library-file -->
   <property name="eclipse-home" value="${basedir}/../../"/>
   <property name="library-file" value="${eclipse-home}/plugins/org.eclipse.test/library.xml"/>
-  <property name="runtime_location" value="${eclipse-home}/core_runtime_sniff_folder"/>
-  <property name="resources_location" value="${eclipse-home}/core_resources_sniff_folder"/>
-  <property name="osgi_location" value="${eclipse-home}/osgi_sniff_folder"/>  
+  <property name="runtime_location" value="${data-dir}/core_runtime_sniff_folder"/>
+  <property name="resources_location" value="${data-dir}/core_resources_sniff_folder"/>
+  <property name="osgi_location" value="${data-dir}/osgi_sniff_folder"/>  
 
   <!-- This target holds all initialization code that needs to be done for -->
   <!-- all tests that are to be run. Initialization for individual tests -->
@@ -96,4 +96,4 @@
   <!-- This target defines the performance tests that need to be run. -->
   <target name="performance-suite" depends="OSGiPerformanceTests,RuntimePerformanceTests,ResourcesPerformanceTests"/>  
 	
- </project>
\ No newline at end of file
+ </project>
diff -uNr plugins.orig/org.eclipse.help.tests_3.1.0/test.xml plugins/org.eclipse.help.tests_3.1.0/test.xml
--- plugins.orig/org.eclipse.help.tests_3.1.0/test.xml	2005-07-12 15:38:07.000000000 -0400
+++ plugins/org.eclipse.help.tests_3.1.0/test.xml	2005-07-12 15:41:47.000000000 -0400
@@ -21,7 +21,7 @@
   <!-- This target defines the tests that need to be run. -->
   <target name="suite">
 
-    <property name="location1" value="${eclipse-home}/help_sniff_folder"/>
+    <property name="location1" value="${data-dir}/help_sniff_folder"/>
     <delete dir="${location1}" quiet="true"/>
     <ant target="core-test" antfile="${library-file}" dir="${eclipse-home}">
       <property name="data-dir" value="${location1}"/>
@@ -54,7 +54,7 @@
 
 	<!-- This target defines the performance tests that need to be run. -->
 	<target name="performance-suite">
-	  <property name="your-performance-folder" value="${eclipse-home}/help_performance_folder"/>
+	  <property name="your-performance-folder" value="${data-dir}/help_performance_folder"/>
 	  <delete dir="${your-performance-folder}" quiet="true"/>
 	  <ant target="core-test" antfile="${library-file}" dir="${eclipse-home}">
 	    <property name="data-dir" value="${your-performance-folder}"/>
diff -uNr plugins.orig/org.eclipse.jdt.core.tests.builder_3.1.0/test.xml plugins/org.eclipse.jdt.core.tests.builder_3.1.0/test.xml
--- plugins.orig/org.eclipse.jdt.core.tests.builder_3.1.0/test.xml	2005-07-12 15:38:07.000000000 -0400
+++ plugins/org.eclipse.jdt.core.tests.builder_3.1.0/test.xml	2005-07-12 15:41:47.000000000 -0400
@@ -23,7 +23,7 @@
   <!-- This target defines the tests that need to be run. -->
   <target name="suite">
     <property name="jdt-builder-folder" 
-              value="${eclipse-home}/jdt_builder_folder"/>
+              value="${data-dir}/jdt_builder_folder"/>
     <delete dir="${jdt-builder-folder}" quiet="true"/>
     <ant target="core-test" antfile="${library-file}" dir="${eclipse-home}">
       <property name="data-dir" value="${jdt-builder-folder}"/>
diff -uNr plugins.orig/org.eclipse.jdt.core.tests.compiler_3.1.0/test.xml plugins/org.eclipse.jdt.core.tests.compiler_3.1.0/test.xml
--- plugins.orig/org.eclipse.jdt.core.tests.compiler_3.1.0/test.xml	2005-07-12 15:38:07.000000000 -0400
+++ plugins/org.eclipse.jdt.core.tests.compiler_3.1.0/test.xml	2005-07-12 15:41:47.000000000 -0400
@@ -16,7 +16,7 @@
   <target name="init">
     <tstamp/>
     <delete>
-      <fileset dir="${eclipse-home}" includes="org*.xml"/>
+      <fileset dir="${data-dir}" includes="org*.xml"/>
     </delete>
   </target>
 
@@ -29,7 +29,7 @@
      </condition>  
     <!-- Parser tests -->
     <property name="jdt-parser-folder" 
-              value="${eclipse-home}/jdt_parser_folder"/>
+              value="${data-dir}/jdt_parser_folder"/>
     <delete dir="${jdt-parser-folder}" quiet="true"/>
     <ant target="core-test" antfile="${library-file}" dir="${eclipse-home}">
       <property name="data-dir" value="${jdt-parser-folder}"/>
@@ -40,7 +40,7 @@
 
     <!-- Compiler regression tests -->
     <property name="jdt-compiler-folder" 
-              value="${eclipse-home}/jdt_compiler_folder"/>
+              value="${data-dir}/jdt_compiler_folder"/>
     <delete dir="${jdt-compiler-folder}" quiet="true"/>
     <ant target="core-test" antfile="${library-file}" dir="${eclipse-home}">
       <property name="data-dir" value="${jdt-compiler-folder}"/>
@@ -55,7 +55,7 @@
  <target name="evaluation_tests" if="onWin32">
     <!-- Evaluation tests -->
     <property name="jdt-eval-folder" 
-              value="${eclipse-home}/jdt_eval_folder"/>
+              value="${data-dir}/jdt_eval_folder"/>
     <delete dir="${jdt-eval-folder}" quiet="true"/>
     <ant target="core-test" antfile="${library-file}" dir="${eclipse-home}">
       <property name="data-dir" value="${jdt-eval-folder}"/>
diff -uNr plugins.orig/org.eclipse.jdt.core.tests.model_3.1.0/test.xml plugins/org.eclipse.jdt.core.tests.model_3.1.0/test.xml
--- plugins.orig/org.eclipse.jdt.core.tests.model_3.1.0/test.xml	2005-07-12 15:38:07.000000000 -0400
+++ plugins/org.eclipse.jdt.core.tests.model_3.1.0/test.xml	2005-07-12 15:41:54.000000000 -0400
@@ -16,7 +16,7 @@
   <target name="init">
     <tstamp/>
     <delete>
-      <fileset dir="${eclipse-home}" includes="org*.xml"/>
+      <fileset dir="${data-dir}" includes="org*.xml"/>
     </delete>
   </target>
 
@@ -24,7 +24,7 @@
   <target name="suite">
     <!-- Java Model tests -->
     <property name="jdt-model-folder" 
-              value="${eclipse-home}/jdt_model_folder"/>
+              value="${data-dir}/jdt_model_folder"/>
     <delete dir="${jdt-model-folder}" quiet="true"/>
     <ant target="core-test" antfile="${library-file}" dir="${eclipse-home}">
       <!-- Use a subdir 'data' so that the JCL jars are put in jdt-model-folder and are deleted at the end of the tests. -->
@@ -36,7 +36,7 @@
 
     <!-- DOM tests -->
     <property name="jdt-dom-folder" 
-              value="${eclipse-home}/jdt_dom_folder"/>
+              value="${data-dir}/jdt_dom_folder"/>
     <delete dir="${jdt-dom-folder}" quiet="true"/>
     <ant target="core-test" antfile="${library-file}" dir="${eclipse-home}">
 	  <!-- Use a subdir 'data' so that the JCL jars are put in jdt-model-folder and are deleted at the end of the tests. -->
@@ -48,7 +48,7 @@
     
     <!-- Formatter tests -->
     <property name="formatter-folder" 
-              value="${eclipse-home}/formatter-folder"/>
+              value="${data-dir}/formatter-folder"/>
     <delete dir="${formatter-folder}" quiet="true"/>
     <ant target="core-test" antfile="${library-file}" dir="${eclipse-home}">
       <property name="data-dir" value="${formatter-folder}"/>
diff -uNr plugins.orig/org.eclipse.jdt.core.tests.performance_3.1.0/test.xml plugins/org.eclipse.jdt.core.tests.performance_3.1.0/test.xml
--- plugins.orig/org.eclipse.jdt.core.tests.performance_3.1.0/test.xml	2005-07-12 15:38:07.000000000 -0400
+++ plugins/org.eclipse.jdt.core.tests.performance_3.1.0/test.xml	2005-07-12 15:41:54.000000000 -0400
@@ -16,14 +16,14 @@
   <target name="init">
     <tstamp/>
     <delete>
-      <fileset dir="${eclipse-home}" includes="org*.xml"/>
+      <fileset dir="${data-dir}" includes="org*.xml"/>
     </delete>
   </target>
 
   <!-- This target defines the tests that need to be run. -->
   <target name="suite">
     <property name="jdt-core-perf-folder" 
-              value="${eclipse-home}/jdt-core-perf-folder"/>
+              value="${data-dir}/jdt-core-perf-folder"/>
     <ant target="core-test" antfile="${library-file}" dir="${eclipse-home}">
    	  <!-- Use a subdir 'data' so that the JCL jars are put in jdt-core-perf-folder and are deleted at the end of the tests. -->
       <property name="data-dir" value="${jdt-core-perf-folder}/data"/>
@@ -50,7 +50,7 @@
 
   <!-- This target defines the performance tests that need to be run. -->
   <target name="performance-suite">
-    <property name="jdt-core-perf-folder" value="${eclipse-home}/jdt-core-perf-folder"/>
+    <property name="jdt-core-perf-folder" value="${data-dir}/jdt-core-perf-folder"/>
     <delete dir="${jdt-core-perf-folder}" quiet="true"/>
     <ant target="core-test" antfile="${library-file}" dir="${eclipse-home}">
       <!-- Use a subdir 'data' so that the JCL jars are put in jdt-core-perf-folder and are deleted at the end of the tests. -->
diff -uNr plugins.orig/org.eclipse.jdt.debug.tests_3.1.0/test.xml plugins/org.eclipse.jdt.debug.tests_3.1.0/test.xml
--- plugins.orig/org.eclipse.jdt.debug.tests_3.1.0/test.xml	2005-07-12 15:38:07.000000000 -0400
+++ plugins/org.eclipse.jdt.debug.tests_3.1.0/test.xml	2005-07-12 15:41:58.000000000 -0400
@@ -16,14 +16,14 @@
   <target name="init">
     <tstamp/>
     <delete>
-      <fileset dir="${eclipse-home}" includes="org*.xml"/>
+      <fileset dir="${data-dir}" includes="org*.xml"/>
     </delete>
   </target>
 
   <!-- This target defines the regression tests that need to be run. -->
   <target name="suite">
     <property name="jdt-folder" 
-              value="${eclipse-home}/jdt_folder"/>
+              value="${data-dir}/jdt_folder"/>
     <delete dir="${jdt-folder}" quiet="true"/>
     <ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
       <property name="data-dir" value="${jdt-folder}"/>
@@ -36,7 +36,7 @@
   <!-- This target defines the performance tests that need to be run. -->
   <target name="perfsuite">
     <property name="jdt-folder" 
-              value="${eclipse-home}/jdt_folder"/>
+              value="${data-dir}/jdt_folder"/>
     <delete dir="${jdt-folder}" quiet="true"/>
     <ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
       <property name="data-dir" value="${jdt-folder}"/>
diff -uNr plugins.orig/org.eclipse.jdt.text.tests_3.1.0/test.xml plugins/org.eclipse.jdt.text.tests_3.1.0/test.xml
--- plugins.orig/org.eclipse.jdt.text.tests_3.1.0/test.xml	2005-07-12 15:38:07.000000000 -0400
+++ plugins/org.eclipse.jdt.text.tests_3.1.0/test.xml	2005-07-12 15:41:58.000000000 -0400
@@ -16,14 +16,14 @@
   <target name="init">
     <tstamp/>
     <delete>
-      <fileset dir="${eclipse-home}" includes="org*.xml"/>
+      <fileset dir="${data-dir}" includes="org*.xml"/>
     </delete>
   </target>
 
   <!-- This target defines the tests that need to be run. -->
   <target name="suite">
     <property name="jdt-text-folder" 
-              value="${eclipse-home}/jdt_text_folder"/>
+              value="${data-dir}/jdt_text_folder"/>
     <delete dir="${jdt-text-folder}" quiet="true"/>
     <ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
       <property name="data-dir" value="${jdt-text-folder}"/>
@@ -34,7 +34,7 @@
 
   <!-- This target defines the performance tests that need to be run. -->
   <target name="performance-suite">
-    <property name="jdt-text-performance-folder" value="${eclipse-home}/jdt_text_performance_folder"/>
+    <property name="jdt-text-performance-folder" value="${data-dir}/jdt_text_performance_folder"/>
     <delete dir="${jdt-text-performance-folder}" quiet="true"/>
     
     <ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
diff -uNr plugins.orig/org.eclipse.jdt.ui.tests_3.1.0/test.xml plugins/org.eclipse.jdt.ui.tests_3.1.0/test.xml
--- plugins.orig/org.eclipse.jdt.ui.tests_3.1.0/test.xml	2005-07-12 15:38:07.000000000 -0400
+++ plugins/org.eclipse.jdt.ui.tests_3.1.0/test.xml	2005-07-12 15:41:59.000000000 -0400
@@ -17,7 +17,7 @@
   <target name="init">
     <tstamp/>
     <delete>
-      <fileset dir="${eclipse-home}" includes="org*.xml"/>
+      <fileset dir="${data-dir}" includes="org*.xml"/>
     </delete>
 
   </target>
@@ -25,7 +25,7 @@
   <!-- This target defines the tests that need to be run. -->
   <target name="suite">
     <property name="jdt-folder" 
-              value="${eclipse-home}/jdt_folder"/>
+              value="${data-dir}/jdt_folder"/>
     <delete dir="${jdt-folder}" quiet="true"/>
    	<condition property="os.isWindows">
     	<os family="windows"/>
@@ -43,7 +43,7 @@
   
     <!-- leak test target -->
   <target name="leaksuite" depends="checkOS" if="os.isWindows">
-    <property name="jdt-folder" value="${eclipse-home}/jdt_folder"/>
+    <property name="jdt-folder" value="${data-dir}/jdt_folder"/>
 
     <delete dir="${jdt-folder}" quiet="true"/>
     <copy file="${eclipse-home}/plugins/${org.eclipse.jdt.ui.tests}/leaks/ProfileNatives.dll" todir="${java.home}/bin" />	
@@ -81,7 +81,7 @@
 
   <!-- performance test target -->
   <target name="performance-suite">
-    <property name="jdt-ui-performance-folder" value="${eclipse-home}/jdt_ui_performance_folder"/>
+    <property name="jdt-ui-performance-folder" value="${data-dir}/jdt_ui_performance_folder"/>
     <property name="data-dir" value="${jdt-ui-performance-folder}"/>
     <property name="plugin-name" value="${plugin-name}"/>
     
diff -uNr plugins.orig/org.eclipse.jdt.ui.tests.refactoring_3.1.0/test.xml plugins/org.eclipse.jdt.ui.tests.refactoring_3.1.0/test.xml
--- plugins.orig/org.eclipse.jdt.ui.tests.refactoring_3.1.0/test.xml	2005-07-12 15:38:07.000000000 -0400
+++ plugins/org.eclipse.jdt.ui.tests.refactoring_3.1.0/test.xml	2005-07-12 15:41:59.000000000 -0400
@@ -16,14 +16,14 @@
 	<target name="init">
 		<tstamp/>
 		<delete>
-			<fileset dir="${eclipse-home}" includes="org*.xml"/>
+			<fileset dir="${data-dir}" includes="org*.xml"/>
 		</delete>
 	</target>
 
 	<!-- This target defines the tests that need to be run. -->
 	<target name="suite">
 		<property name="refactoring-folder" 
-              value="${eclipse-home}/refactoring_folder"/>
+              value="${data-dir}/refactoring_folder"/>
 		<delete dir="${refactoring-folder}" quiet="true"/>
 		<ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
 			<property name="data-dir" value="${refactoring-folder}"/>
@@ -35,7 +35,7 @@
 
 	<!-- performance test target -->
 	<target name="performance-suite">
-		<property name="jdt-ui-refactoring-performance-folder" value="${eclipse-home}/jdt_ui_refactoring_performance_folder"/>
+		<property name="jdt-ui-refactoring-performance-folder" value="${data-dir}/jdt_ui_refactoring_performance_folder"/>
 		<property name="data-dir" value="${jdt-ui-refactoring-performance-folder}"/>
 		<property name="plugin-name" value="${plugin-name}"/>
 
diff -uNr plugins.orig/org.eclipse.jface.text.tests_3.1.0/test.xml plugins/org.eclipse.jface.text.tests_3.1.0/test.xml
--- plugins.orig/org.eclipse.jface.text.tests_3.1.0/test.xml	2005-07-12 15:38:07.000000000 -0400
+++ plugins/org.eclipse.jface.text.tests_3.1.0/test.xml	2005-07-12 15:42:11.000000000 -0400
@@ -16,14 +16,14 @@
   <target name="init">
     <tstamp/>
     <delete>
-      <fileset dir="${eclipse-home}" includes="org*.xml"/>
+      <fileset dir="${data-dir}" includes="org*.xml"/>
     </delete>
   </target>
 
   <!-- This target defines the tests that need to be run. -->
   <target name="suite">
     <property name="jface-text-folder" 
-              value="${eclipse-home}/jface_text_folder"/>
+              value="${data-dir}/jface_text_folder"/>
     <delete dir="${jface-text-folder}" quiet="true"/>
     <ant target="core-test" antfile="${library-file}" dir="${eclipse-home}">
       <property name="data-dir" value="${jface-text-folder}"/>
diff -uNr plugins.orig/org.eclipse.ltk.core.refactoring.tests_3.1.0/test.xml plugins/org.eclipse.ltk.core.refactoring.tests_3.1.0/test.xml
--- plugins.orig/org.eclipse.ltk.core.refactoring.tests_3.1.0/test.xml	2005-07-12 15:38:07.000000000 -0400
+++ plugins/org.eclipse.ltk.core.refactoring.tests_3.1.0/test.xml	2005-07-12 15:42:11.000000000 -0400
@@ -16,14 +16,14 @@
   <target name="init">
     <tstamp/>
     <delete>
-      <fileset dir="${eclipse-home}" includes="org*.xml"/>
+      <fileset dir="${data-dir}" includes="org*.xml"/>
     </delete>
   </target>
 
   <!-- This target defines the tests that need to be run. -->
   <target name="suite">
     <property name="refactoring-core-folder" 
-              value="${eclipse-home}/refactoring_core_folder"/>
+              value="${data-dir}/refactoring_core_folder"/>
     <delete dir="${refactoring-core-folder}" quiet="true"/>
     <ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
       <property name="data-dir" value="${refactoring-core-folder}"/>
diff -uNr plugins.orig/org.eclipse.ltk.ui.refactoring.tests_3.1.0/test.xml plugins/org.eclipse.ltk.ui.refactoring.tests_3.1.0/test.xml
--- plugins.orig/org.eclipse.ltk.ui.refactoring.tests_3.1.0/test.xml	2005-07-12 15:38:07.000000000 -0400
+++ plugins/org.eclipse.ltk.ui.refactoring.tests_3.1.0/test.xml	2005-07-12 15:42:11.000000000 -0400
@@ -16,14 +16,14 @@
   <target name="init">
     <tstamp/>
     <delete>
-      <fileset dir="${eclipse-home}" includes="org*.xml"/>
+      <fileset dir="${data-dir}" includes="org*.xml"/>
     </delete>
   </target>
 
   <!-- This target defines the tests that need to be run. -->
   <target name="suite">
     <property name="refactoring-ui-folder" 
-              value="${eclipse-home}/refactoring_ui_folder"/>
+              value="${data-dir}/refactoring_ui_folder"/>
     <delete dir="${refactoring-ui-folder}" quiet="true"/>
     <ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
       <property name="data-dir" value="${refactoring-ui-folder}"/>
diff -uNr plugins.orig/org.eclipse.pde.ui.tests_3.1.0/test.xml plugins/org.eclipse.pde.ui.tests_3.1.0/test.xml
--- plugins.orig/org.eclipse.pde.ui.tests_3.1.0/test.xml	2005-07-12 15:38:07.000000000 -0400
+++ plugins/org.eclipse.pde.ui.tests_3.1.0/test.xml	2005-07-12 15:42:12.000000000 -0400
@@ -14,14 +14,14 @@
   <target name="init">
     <tstamp/>
     <delete>
-      <fileset dir="${eclipse-home}" includes="org*.xml"/>
+      <fileset dir="${data-dir}" includes="org*.xml"/>
     </delete>
   </target>
 
   <!-- This target defines the tests that need to be run. -->
   <target name="suite">
 
-    <property name="location1" value="${eclipse-home}/pde_sniff_folder"/>
+    <property name="location1" value="${data-dir}/pde_sniff_folder"/>
     <delete dir="${location1}" quiet="true"/>
     <ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
       <property name="data-dir" value="${location1}"/>
@@ -47,7 +47,7 @@
 
 	<!-- This target defines the performance tests that need to be run. -->
 	<target name="performance-suite">
-	  <property name="your-performance-folder" value="${eclipse-home}/pde_performance_folder"/>
+	  <property name="your-performance-folder" value="${data-dir}/pde_performance_folder"/>
 	  <delete dir="${your-performance-folder}" quiet="true"/>
 	  <ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
 	    <property name="data-dir" value="${your-performance-folder}"/>
diff -uNr plugins.orig/org.eclipse.releng.tests_3.1.0/test.xml plugins/org.eclipse.releng.tests_3.1.0/test.xml
--- plugins.orig/org.eclipse.releng.tests_3.1.0/test.xml	2005-07-12 15:38:07.000000000 -0400
+++ plugins/org.eclipse.releng.tests_3.1.0/test.xml	2005-07-12 15:42:12.000000000 -0400
@@ -52,4 +52,4 @@
     </ant>
   </target>
 
- </project>
\ No newline at end of file
+ </project>
diff -uNr plugins.orig/org.eclipse.swt.tests_3.1.0/test.xml plugins/org.eclipse.swt.tests_3.1.0/test.xml
--- plugins.orig/org.eclipse.swt.tests_3.1.0/test.xml	2005-07-12 15:38:07.000000000 -0400
+++ plugins/org.eclipse.swt.tests_3.1.0/test.xml	2005-07-12 15:42:12.000000000 -0400
@@ -18,13 +18,13 @@
   <target name="init">
     <tstamp/>
     <delete>
-      <fileset dir="${eclipse-home}" includes="org*.xml"/>
+      <fileset dir="${data-dir}" includes="org*.xml"/>
     </delete>
   </target>
 
   <!-- This target defines the tests that need to be run. -->
   <target name="suite" unless="performance">
-    <property name="data" value="${eclipse-home}/swt_sniff_folder"/>
+    <property name="data" value="${data-dir}/swt_sniff_folder"/>
     <delete dir="${location1}" quiet="true"/>
     <!-- Run all SWT tests on Windows. Run only Gtk tests otherwise. -->
     <condition property="class-tests" value="org.eclipse.swt.tests.junit.AllGtkTests">
@@ -47,7 +47,7 @@
 
   <!--  This target defines the performance tests that need to be run. --> 
   <target name="performance-suite">
-    <property name="swt-performance-folder" value="${eclipse-home}/swt_performance_folder" /> 
+    <property name="swt-performance-folder" value="${data-dir}/swt_performance_folder" /> 
     <delete dir="${swt-performance-folder}" quiet="true" /> 
     <ant target="core-test" antfile="${library-file}" dir="${eclipse-home}">
       <property name="timeout" value="14400000"/>
diff -uNr plugins.orig/org.eclipse.team.tests.core_3.1.0/test.xml plugins/org.eclipse.team.tests.core_3.1.0/test.xml
--- plugins.orig/org.eclipse.team.tests.core_3.1.0/test.xml	2005-07-12 15:38:07.000000000 -0400
+++ plugins/org.eclipse.team.tests.core_3.1.0/test.xml	2005-07-12 15:42:13.000000000 -0400
@@ -19,7 +19,7 @@
 
   <!-- This target defines the tests that need to be run. -->
   <target name="suite">
-    <property name="location" value="${eclipse-home}/team_test_workspace"/>
+    <property name="location" value="${data-dir}/team_test_workspace"/>
     <delete dir="${location}" quiet="true"/>
 
     <!-- Session Test ** Team Core ** -->
diff -uNr plugins.orig/org.eclipse.team.tests.cvs.core_3.1.0/test.xml plugins/org.eclipse.team.tests.cvs.core_3.1.0/test.xml
--- plugins.orig/org.eclipse.team.tests.cvs.core_3.1.0/test.xml	2005-07-12 15:38:07.000000000 -0400
+++ plugins/org.eclipse.team.tests.cvs.core_3.1.0/test.xml	2005-07-12 15:42:13.000000000 -0400
@@ -25,7 +25,7 @@
 
   <!-- This target defines the tests that need to be run for regression testing. -->
   <target name="suite">
-    <property name="location" value="${eclipse-home}/cvs_sniff_folder"/>
+    <property name="location" value="${data-dir}/cvs_sniff_folder"/>
     <delete dir="${location}" quiet="true"/>
 
     <!-- Session Test ** CVS Provider ** -->
@@ -49,7 +49,7 @@
   <!-- This target defines the performance tests that need to be run. -->
   <target name="performance-suite">
     <property name="cvs-performance-folder" 
-              value="${eclipse-home}/cvs_performance_folder"/>
+              value="${data-dir}/cvs_performance_folder"/>
     <delete dir="${cvs-performance-folder}" quiet="true"/>
     <ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
       <property name="vmargs" value="-Declipse.cvs.properties=${team-home}/repository.properties -Declipse.cvs.loopCount=5  -Declipse.cvs.recordProtocolTraffic=false"/>
diff -uNr plugins.orig/org.eclipse.text.tests_3.1.0/test.xml plugins/org.eclipse.text.tests_3.1.0/test.xml
--- plugins.orig/org.eclipse.text.tests_3.1.0/test.xml	2005-07-12 15:38:07.000000000 -0400
+++ plugins/org.eclipse.text.tests_3.1.0/test.xml	2005-07-12 15:42:13.000000000 -0400
@@ -16,14 +16,14 @@
   <target name="init">
     <tstamp/>
     <delete>
-      <fileset dir="${eclipse-home}" includes="org*.xml"/>
+      <fileset dir="${data-dir}" includes="org*.xml"/>
     </delete>
   </target>
 
   <!-- This target defines the tests that need to be run. -->
   <target name="suite">
     <property name="eclipse-text-folder" 
-              value="${eclipse-home}/eclipse_text_folder"/>
+              value="${data-dir}/eclipse_text_folder"/>
     <delete dir="${eclipse-text-folder}" quiet="true"/>
     <ant target="core-test" antfile="${library-file}" dir="${eclipse-home}">
       <property name="data-dir" value="${eclipse-text-folder}"/>
diff -uNr plugins.orig/org.eclipse.ui.editors.tests_3.1.0/test.xml plugins/org.eclipse.ui.editors.tests_3.1.0/test.xml
--- plugins.orig/org.eclipse.ui.editors.tests_3.1.0/test.xml	2005-07-12 15:38:07.000000000 -0400
+++ plugins/org.eclipse.ui.editors.tests_3.1.0/test.xml	2005-07-12 15:42:13.000000000 -0400
@@ -16,14 +16,14 @@
   <target name="init">
     <tstamp/>
     <delete>
-      <fileset dir="${eclipse-home}" includes="org*.xml"/>
+      <fileset dir="${data-dir}" includes="org*.xml"/>
     </delete>
   </target>
 
   <!-- This target defines the tests that need to be run. -->
   <target name="suite">
     <property name="eclipse-editors-folder" 
-              value="${eclipse-home}/eclipse_editors_folder"/>
+              value="${data-dir}/eclipse_editors_folder"/>
     <delete dir="${eclipse-editors-folder}" quiet="true"/>
     <ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
       <property name="data-dir" value="${eclipse-editors-folder}"/>
diff -uNr plugins.orig/org.eclipse.ui.tests_3.1.0/test.xml plugins/org.eclipse.ui.tests_3.1.0/test.xml
--- plugins.orig/org.eclipse.ui.tests_3.1.0/test.xml	2005-07-12 15:38:07.000000000 -0400
+++ plugins/org.eclipse.ui.tests_3.1.0/test.xml	2005-07-12 15:42:13.000000000 -0400
@@ -16,7 +16,7 @@
   <target name="init">
     <tstamp/>
     <delete>
-      <fileset dir="${eclipse-home}" includes="org*.xml"/>
+      <fileset dir="${data-dir}" includes="org*.xml"/>
     </delete>
   </target>
 
@@ -43,7 +43,7 @@
     -->
 
     <property name="sniff-folder"
-              value="${eclipse-home}/ui_sniff_folder"/>
+              value="${data-dir}/ui_sniff_folder"/>
     <delete dir="${sniff-folder}" quiet="true"/>
     <ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
       <property name="data-dir" value="${sniff-folder}"/>
@@ -54,7 +54,7 @@
     </ant>
     
     <property name="jface-sniff-folder"
-              value="${eclipse-home}/jface_sniff_folder"/>
+              value="${data-dir}/jface_sniff_folder"/>
     <delete dir="${jface-sniff-folder}" quiet="true"/>
     <ant target="core-test" antfile="${library-file}" dir="${eclipse-home}">
       <property name="data-dir" value="${jface-sniff-folder}"/>
@@ -103,7 +103,7 @@
   </target>
   
   <target name="performance-suite">
-  	<property name="performance-workspace" value="${eclipse-home}/performance-workspace-platform-ui"/>
+  	<property name="performance-workspace" value="${data-dir}/performance-workspace-platform-ui"/>
     <delete dir="${performance-workspace}" quiet="true"/>
   	<ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
       <property name="data-dir" value="${performance-workspace}"/>
@@ -113,7 +113,7 @@
   </target>
 
 	<target name="jface-performance-suite">
-	  	<property name="performance-workspace-jface" value="${eclipse-home}/performance-workspace-platform-jface"/>
+	  	<property name="performance-workspace-jface" value="${data-dir}/performance-workspace-platform-jface"/>
 	    <delete dir="${performance-workspace-jface}" quiet="true"/>
 	  	<ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
 	      <property name="data-dir" value="${performance-workspace-jface}"/>
diff -uNr plugins.orig/org.eclipse.ui.tests.rcp_3.1.0/test.xml plugins/org.eclipse.ui.tests.rcp_3.1.0/test.xml
--- plugins.orig/org.eclipse.ui.tests.rcp_3.1.0/test.xml	2005-07-12 15:38:07.000000000 -0400
+++ plugins/org.eclipse.ui.tests.rcp_3.1.0/test.xml	2005-07-12 15:42:13.000000000 -0400
@@ -15,14 +15,14 @@
   <target name="init">
     <tstamp/>
     <delete>
-      <fileset dir="${eclipse-home}" includes="org*.xml"/>
+      <fileset dir="${data-dir}" includes="org*.xml"/>
     </delete>
   </target>
 
   <!-- This target defines the tests that need to be run. -->
   <target name="suite">
     <property name="rcp-folder" 
-              value="${eclipse-home}/ui_rcp_folder"/>
+              value="${data-dir}/ui_rcp_folder"/>
     <delete dir="${rcp-folder}" quiet="true"/>
     <ant target="core-test" antfile="${library-file}" dir="${eclipse-home}">
       <property name="data-dir" value="${rcp-folder}"/>
@@ -56,7 +56,7 @@
   </target>
 
   <target name="performance-suite">
-  	<property name="performance-workspace" value="${eclipse-home}/performance-workspace-platform-rcp"/>
+  	<property name="performance-workspace" value="${data-dir}/performance-workspace-platform-rcp"/>
     <delete dir="${performance-workspace}" quiet="true"/>
   	<ant target="core-test" antfile="${library-file}" dir="${eclipse-home}">
       <property name="data-dir" value="${performance-workspace}"/>
diff -uNr plugins.orig/org.eclipse.ui.workbench.texteditor.tests_3.1.0/test.xml plugins/org.eclipse.ui.workbench.texteditor.tests_3.1.0/test.xml
--- plugins.orig/org.eclipse.ui.workbench.texteditor.tests_3.1.0/test.xml	2005-07-12 15:38:07.000000000 -0400
+++ plugins/org.eclipse.ui.workbench.texteditor.tests_3.1.0/test.xml	2005-07-12 15:42:13.000000000 -0400
@@ -16,14 +16,14 @@
   <target name="init">
     <tstamp/>
     <delete>
-      <fileset dir="${eclipse-home}" includes="org*.xml"/>
+      <fileset dir="${data-dir}" includes="org*.xml"/>
     </delete>
   </target>
 
   <!-- This target defines the tests that need to be run. -->
   <target name="suite">
     <property name="eclipse-workbench-texteditor-folder" 
-              value="${eclipse-home}/eclipse_workbench_texteditor_folder"/>
+              value="${data-dir}/eclipse_workbench_texteditor_folder"/>
     <delete dir="${eclipse-workbench-texteditor-folder}" quiet="true"/>
     <ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
       <property name="data-dir" value="${eclipse-workbench-texteditor-folder}"/>
diff -uNr plugins.orig/org.eclipse.update.tests.core_3.1.0/test.xml plugins/org.eclipse.update.tests.core_3.1.0/test.xml
--- plugins.orig/org.eclipse.update.tests.core_3.1.0/test.xml	2005-07-12 15:38:07.000000000 -0400
+++ plugins/org.eclipse.update.tests.core_3.1.0/test.xml	2005-07-12 15:42:13.000000000 -0400
@@ -16,13 +16,13 @@
   <target name="init">
     <tstamp/>
     <delete>
-      <fileset dir="${eclipse-home}" includes="org*.xml"/>
+      <fileset dir="${data-dir}" includes="org*.xml"/>
     </delete>
   </target>
   
   <!-- This target defines the tests that need to be run. -->
   <target name="suite">
-    <property name="sniff-folder" value="${eclipse-home}/update_core_sniff_folder"/>
+    <property name="sniff-folder" value="${data-dir}/update_core_sniff_folder"/>
     <delete dir="${sniff-folder}" quiet="true"/>
     
     <ant target="core-test" antfile="${library-file}" dir="${eclipse-home}">
@@ -49,7 +49,7 @@
 	
 	<!-- This target defines the performance tests that need to be run. -->
 	<target name="performance-suite">
-	  <property name="your-performance-folder" value="${eclipse-home}/update_performance_folder"/>
+	  <property name="your-performance-folder" value="${data-dir}/update_performance_folder"/>
 	  <delete dir="${your-performance-folder}" quiet="true"/>
 	  <ant target="core-test" antfile="${library-file}" dir="${eclipse-home}">
 	    <property name="data-dir" value="${your-performance-folder}"/>
@@ -66,4 +66,4 @@
 	  </ant>
 	</target>
 
-</project>
\ No newline at end of file
+</project>

eclipse-tests-library.xml.patch:
 library.xml |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE eclipse-tests-library.xml.patch ---
--- library.xml.orig	2005-07-11 11:55:38.000000000 -0400
+++ library.xml	2005-07-11 11:58:17.000000000 -0400
@@ -54,7 +54,7 @@
 	    </classpath>
 	    <arg line="-application ${application}"/>
 	    <arg line="-dev bin -data ${data-dir}"/>
-	    <arg line="formatter=${formatter},${classname}.xml"/>
+	    <arg line="formatter=${formatter},${data-dir}/${classname}.xml"/>
 	    <arg line="-testPluginName ${plugin-name}"/>
 	    <arg line="-className ${classname}"/>
 	    <arg line="-os ${os}"/>
@@ -72,7 +72,7 @@
 includes		- the names of the files to include
 output-file		- the name of the output file to produce
 -->
-    <junitreport todir="." tofile="${output-file}">
+    <junitreport todir="${data-dir}" tofile="${output-file}">
       <fileset dir=".">
         <include name="${includes}"/>
       </fileset>

eclipse-tests-runtests.patch:
 runtests |   39 +++++++++++++++++++++++++++++----------
 1 files changed, 29 insertions(+), 10 deletions(-)

--- NEW FILE eclipse-tests-runtests.patch ---
--- runtests.orig	2005-07-12 16:26:17.000000000 -0400
+++ runtests	2005-07-12 16:27:54.000000000 -0400
@@ -3,8 +3,9 @@
 # by default, use the java executable on the path
 vm=java
 
+# Don't do this 'cause we run the tests in an Xvfb
 #set the DISPLAY for running tests on Linux
-DISPLAY=`$HOST`:0.0;export DISPLAY
+#DISPLAY=`$HOST`:0.0;export DISPLAY
 
 #this value must be set when using rsh to execute this script, otherwise the script will execute from the user's home directory
 dir=.
@@ -24,7 +25,7 @@
 properties=
 
 # message printed to console
-usage="usage: $0 -os <osType> -ws <windowingSystemType> -arch <architecture> [-noclean] [<test target>][-properties <path>]"
+usage="usage: $0 -os <osType> -ws <windowingSystemType> -arch <architecture> -datadir <path> [-noclean] [<test target>][-properties <path>]"
 
 
 # proces command line arguments
@@ -35,6 +36,7 @@
 		-os) os="$2"; shift;;
 		-ws) ws="$2"; shift;;
 		-arch) arch="$2"; shift;;
+		-datadir) datadir="$2"; shift;;
 		-noclean) installmode="noclean";;
 		-properties) properties="-propertyfile $2";shift;;
 		-vm) vm="$2";shift;;
@@ -62,20 +64,38 @@
 	exit 1
 fi
 
+if [ "x$datadir" = "x" ]
+then
+	datadir=$(pwd)
+fi
+
 #necessary when invoking this script through rsh
 cd $dir
 
 # verify os, ws and arch values passed in are valid before running tests
-if [ "$os-$ws-$arch" = "linux-motif-x86" ] || [ "$os-$ws-$arch" = "linux-gtk-x86" ] || [ "$os-$ws-$arch" = "solaris-motif-sparc" ] || [ "$os-$ws-$arch" = "solaris-gtk-sparc" ]|| [ "$os-$ws-$arch" = "aix-motif-sparc" ] || [ "$os-$ws-$arch" = "hpux-motif-ppc" ] || [ "$os-$ws-$arch" = "qnx-photon-x86" ]
+if [ "$os-$ws-$arch" = "linux-motif-x86" ] || [ "$os-$ws-$arch" = "linux-gtk-x86" ] || [ "$os-$ws-$arch" = "linux-gtk-ia64" ] || [ "$os-$ws-$arch" = "solaris-motif-sparc" ] || [ "$os-$ws-$arch" = "solaris-gtk-sparc" ]|| [ "$os-$ws-$arch" = "aix-motif-sparc" ] || [ "$os-$ws-$arch" = "hpux-motif-ppc" ] || [ "$os-$ws-$arch" = "qnx-photon-x86" ] || [ "$os-$ws-$arch" = "linux-gtk-ppc" ]
 then
-	if [ ! -r eclipse ]
-	then
-		tar -xzf eclipse-SDK-*.tar.gz
-		unzip -qq -o -C eclipse-junit-tests-*.zip */plugins/org.eclipse.test*
-	fi
+# We don't unzip because we want to run using the _installed_ eclipse and tests
+#        if [ ! -r eclipse ]
+#        then
+#                tar -xzf eclipse-SDK-*.tar.gz
+#                unzip -qq -o -C eclipse-junit-tests-*.zip */plugins/org.eclipse.test*
+#        fi
 	
 # run tests
-$vm -cp eclipse/startup.jar -Dosgi.ws=$ws -Dosgi.os=$os -Dosgi.arch=$arch org.eclipse.core.launcher.Main -data workspace -application org.eclipse.ant.core.antRunner -file test.xml $tests -Dws=$ws -Dos=$os -Darch=$arch -D$installmode=true $properties -logger org.apache.tools.ant.DefaultLogger
+# Run each test individually since genHtml works when called explicitly with ant
+# but not by the Eclipse antrunner; this isn't a big deal.
+for target in jdttext pdeui ant compare core coreexpressions help update teamcore teamcvs jdtcoreperf jdtcorebuilder jdtcorecompiler jdtcoremodel ui uieditors uiworkbenchtexteditor uircp jdtdebug jdtui jdtuirefactoring ltkuirefactoringtests ltkcorerefactoringtests text jface filebuffers antui swt
+do
+	echo $vm -cp /usr/share/eclipse/startup.jar -Dosgi.ws=$ws -Dosgi.os=$os -Dosgi.arch=$arch org.eclipse.core.launcher.Main -data workspace -application org.eclipse.ant.core.antRunner -file /usr/share/eclipse/plugins/org.eclipse.test/test.xml $target -Dws=$ws -Dos=$os -Darch=$arch -D$installmode=true -Ddata-dir=$datadir -logger org.apache.tools.ant.DefaultLogger       
+	$vm -cp /usr/share/eclipse/startup.jar -Dosgi.ws=$ws -Dosgi.os=$os -Dosgi.arch=$arch org.eclipse.core.launcher.Main -data workspace -application org.eclipse.ant.core.antRunner -file /usr/share/eclipse/plugins/org.eclipse.test/test.xml $target -Dws=$ws -Dos=$os -Darch=$arch -D$installmode=true -Ddata-dir=$datadir -logger org.apache.tools.ant.DefaultLogger
+	# XML -> HTML
+	echo ant -Ddata-dir=$datadir -f /usr/share/eclipse/plugins/org.eclipse.test/test.xml genHtml
+	ant -Ddata-dir=$datadir -f /usr/share/eclipse/plugins/org.eclipse.test/test.xml genHtml
+
+	# Remove the workspace between each set of tests
+	rm -rf .metadata workspace
+done
 
 # display message to user if os, ws and arch are invalid
 else
@@ -83,4 +103,3 @@
 
 exit 1
 fi
-

eclipse-tests-test.xml.patch:
 test.xml |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

--- NEW FILE eclipse-tests-test.xml.patch ---
--- test.xml.orig	2005-07-26 14:43:37.000000000 -0400
+++ test.xml	2005-07-26 14:46:17.000000000 -0400
@@ -7,7 +7,7 @@
 	<property file="label.properties" />
 	
 	<!--default directory where test-eclipse will be installed-->
-	<property name="install" value="${basedir}/test-eclipse" />
+	<property name="install" value="/usr/share" />
 	
 	<!--name that can be added to report name to identify which platform tests results come from-->
 	<property name="platform" value="" />
@@ -16,7 +16,7 @@
 	<property name="eclipse-home" value="${install}/eclipse" />
 
 	<!-- The directory that will contain the xml and html results from the tests that are run -->
- 	<property name="results" value="${basedir}/results" />
+ 	<property name="results" value="${data-dir}/results" />
 	
 	<target name="setup" unless="noclean">
 		<condition property="tar.gz">
@@ -55,22 +55,22 @@
 
 	<target name="configureTeamTest">
 		<!-- Fill in cvs repository information -->
-		<replace file="${eclipse-home}/plugins/${org.eclipse.team.tests.cvs.core}/repository.properties" token="@user@" value="@cvs_user@"/>
-		<replace file="${eclipse-home}/plugins/${org.eclipse.team.tests.cvs.core}/repository.properties" token="@password@" value="@cvs_password@"/>
-		<replace file="${eclipse-home}/plugins/${org.eclipse.team.tests.cvs.core}/repository.properties" token="@host@" value="@cvs_host@"/>
-		<replace file="${eclipse-home}/plugins/${org.eclipse.team.tests.cvs.core}/repository.properties" token="@root@" value="@cvs_root@"/>
+		<replace file="${eclipse-home}/plugins/${org.eclipse.team.tests.cvs.core}/repository.properties" token="@user@" value="anoncvs"/>
+		<replace file="${eclipse-home}/plugins/${org.eclipse.team.tests.cvs.core}/repository.properties" token="@password@" value="anoncvs"/>
+		<replace file="${eclipse-home}/plugins/${org.eclipse.team.tests.cvs.core}/repository.properties" token="@host@" value="localhost:2402"/>
+		<replace file="${eclipse-home}/plugins/${org.eclipse.team.tests.cvs.core}/repository.properties" token="@root@" value="/var/lib/eclipse-demo-cvsroot"/>
 	</target>
 	
 	<target name="junit" depends="setup">
 		<ant antfile="${eclipse-home}/plugins/${testPlugin}/test.xml" dir="${eclipse-home}" />
-		<copy file="${eclipse-home}/${report}.xml" tofile="${results}/xml/${report}_${platform}.xml" failonerror="false" />
+		<copy file="${data-dir}/${report}.xml" tofile="${results}/xml/${report}_${platform}.xml" failonerror="false" />
 		<antcall target="genHtml" />
 	</target>
 
 	<target name="performance" if="performance.target.present">
 		<antcall target="setup" />
 		<ant antfile="${eclipse-home}/plugins/${testPlugin}/test.xml" dir="${eclipse-home}" target="performance" />
-		<copy file="${eclipse-home}/${report}.xml" tofile="${results}/xml/${report}_${platform}.xml" failonerror="false" />
+		<copy file="${data-dir}/${report}.xml" tofile="${results}/xml/${report}_${platform}.xml" failonerror="false" />
 		<antcall target="genHtml" />
 	</target>
 


--- NEW FILE eclipse-tests.spec ---
# TODO:
# . robustification (runtests-wrapper, etc.)
# . verify changes made to allow running as non-root
# . why is there a "- option not found" error?
# . are the dependencies all correct?
# DONE . do "/usr/share" -> "%{_datadir}" sed --in-place in the specfile
# . make runtests-wrapper better (a python script?)
# DONE . why does the HTML translation not really work?
#   (because the XSL translation needed the collect target to work)
# . why does having eclipse-tests installed make every startup of eclipse run in
#   some sort of testing mode?

# All arches line up except i386 -> x86
%ifarch %{ix86}
%define eclipse_arch    x86
%else
%define eclipse_arch   %{_arch}
%endif

%define gcj_support     1
%define eclipse_major   3
%define eclipse_minor   1
%define eclipse_micro   0
%define eclipse_majmin  %{eclipse_major}.%{eclipse_minor}
%define eclipse_base    %{_datadir}/eclipse
%define build_id	I20050627-1435

Summary: JUnit Eclipse test plugins
Name: eclipse-tests
Version: %{eclipse_majmin}.%{eclipse_micro}_fc
Release: 7
License: EPL
Group: Development/Tools
URL: http://www.eclipse.org
Requires: eclipse-pde-devel = %{version}
#Requires: redhat-eclipse-demo
Requires: xorg-x11-Xvfb

Source0: http://download.eclipse.org/eclipse/downloads/drops/R-3.1-200506271435/eclipse-Automated-Tests-3.1.zip
Source1: runtests-wrapper

Patch0: %{name}-test.xml.patch
Patch1: %{name}-runtests.patch
Patch2: %{name}-library.xml.patch
Patch3: %{name}-directories.patch
Patch4: %{name}-cvsrepository.patch

BuildRequires:  jpackage-utils >= 0:1.5

%if %{gcj_support}
ExclusiveArch: %{ix86} x86_64 ppc
%else
BuildArch:	noarch
%endif

BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot

%description
JUnit Eclipse test plugins.  Run like so:
RESULT_HOME=`pwd` /usr/share/eclipse/plugins/org.eclipse.test/runtests-wrapper
or on ppc64:
RESULT_HOME=`pwd` setarch ppc32 /usr/share/eclipse/plugins/org.eclipse.test/runtests-wrapper

%prep
%setup -q -c 
pushd eclipse-testing
  unzip -qq eclipse-junit-tests-%{build_id}.zip
  cp %{SOURCE1} .
%patch0 -p0
%patch1 -p0
  pushd eclipse/plugins/org.eclipse.test
%patch2 -p0
  popd
  for f in $(find -name test.xml); do \
      sed --in-place \ "s:collect\" antfile=\"\${library-file}\" dir=\"\${eclipse-home}\">:collect\" antfile=\"\${library-file}\" dir=\"\${data-dir}\">:" \
	$f;
  done
  sed --in-place "s:/usr/share:%{_datadir}:g" test.xml
  sed --in-place "s:/usr/share:%{_datadir}:g" runtests
  sed --in-place "s:/usr/share:%{_datadir}:g" runtests-wrapper
  sed --in-place "s:/usr/lib:%{_libdir}:g" runtests-wrapper
  pushd eclipse
%patch3 -p0
  popd
  pushd eclipse/plugins/org.eclipse.team.tests.cvs.core_%{eclipse_majmin}.%{eclipse_micro}
%patch4 -p0
  popd
popd

%build

%install
rm -rf ${RPM_BUILD_ROOT}

install -d -m 755 $RPM_BUILD_ROOT%{eclipse_base}

pushd eclipse-testing
cp -r eclipse/features $RPM_BUILD_ROOT%{eclipse_base}
cp -r eclipse/plugins $RPM_BUILD_ROOT%{eclipse_base}
cp runtests $RPM_BUILD_ROOT%{eclipse_base}/plugins/org.eclipse.test
cp runtests-wrapper $RPM_BUILD_ROOT%{eclipse_base}/plugins/org.eclipse.test
cp test.* $RPM_BUILD_ROOT%{eclipse_base}/plugins/org.eclipse.test
cp readme* $RPM_BUILD_ROOT%{eclipse_base}/plugins/org.eclipse.test
cp JUNIT* $RPM_BUILD_ROOT%{eclipse_base}/plugins/org.eclipse.test
popd

%clean 
rm -rf ${RPM_BUILD_ROOT}

%files
%defattr(-,root,root)
%{eclipse_base}/features/*
%{eclipse_base}/plugins/*

%changelog
* Tue Jul 26 2005 Andrew Overholt <overholt redhat com> 3.1.0_fc-7
- Remove integration of redhat-eclipse-demo; Require it instead.
- Set up CVS tests to use redhat-eclipse-demo.
- Require eclipse-pde-devel to make sure we get everything.
- Require xorg-x11-Xvfb.
- Add linux-gtk-ia64 to runtests patch.

* Wed Jul 13 2005 Andrew Overholt <overholt redhat com> 3.1.0_fc-6
- Add Anthony Green's redhat-eclipse-demo CVS magic.
- Require xinetd for above.

* Tue Jul 12 2005 Andrew Overholt <overholt redhat com> 3.1.0_fc-5
- Add eclipse-home -> data-dir in each test.xml to make collect target (and
  therefore xml -> html) work.
- Change runtests patch to reflect ability to do genHtml.
- Add patch to make all collect targets work.

* Mon Jul 11 2005 Andrew Overholt <overholt redhat com> 3.1.0_fc-4
- Further robustification.

* Wed Jul 06 2005 Andrew Overholt <overholt redhat com> 3.1.0_fc-3
- Minor cleanups.
- Allow running of tests using installed Eclipse and as regular user.

* Tue Jul 04 2005 Aaron Luchko <aluchko redhat com> 3.1.0_fc-2
- do patch, updated runtests-wrapper
- patch runtests for genHtmlVm

* Mon Jul 04 2005 Aaron Luchko <aluchko redhat com> 3.1.0_fc-1
- Updated to 3.1 final
- Checks install eclipse version

* Wed Jun 29 2005 Aaron Luchko <aluchko redhat com> 3.1.0_fc-0.RC3.3
- Updated to RC3
- Added x86_64

* Thu May 26 2005 Aaron Luchko <aluchko redhat com> 3.1.0_fc-M7.1
- Move to M7
* Tue Apr 19 2005 Aaron Luchko <aluchko redhat com> 3.1.0-1
- Sync with eclipse version (tests are M6)
* Mon Feb 21 2005 Aaron Luchko <aluchko redhat com> 3.1.0-1
- Change to 3.1.0M5

* Fri Aug 13 2004 Jeremy Handcock <handcock redhat com> 3.0-3
- Correct SWT test plugin name in test.properties

* Thu Aug 12 2004 Jeremy Handcock <handcock redhat com> 3.0-2
- Don't build on ppc64pseries
- Require eclipse-ui, not eclipse-platform
- Only install features and plugins
- Add test run scripts and required files
- Add library.xml patch

* Thu Jul  8 2004 Jeremy Handcock <handcock redhat com> 3.0-1
- Initial version


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/eclipse-tests/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	28 Jul 2005 19:16:16 -0000	1.2
+++ .cvsignore	28 Jul 2005 20:28:14 -0000	1.3
@@ -1 +1 @@
-eclipse-Automated-Tests-3.0.2.zip
+eclipse-Automated-Tests-3.1.zip


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/eclipse-tests/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	28 Jul 2005 19:16:16 -0000	1.2
+++ sources	28 Jul 2005 20:28:14 -0000	1.3
@@ -1 +1 @@
-a5da4e47c5df8a4a89cc71d588c3d84a  eclipse-Automated-Tests-3.0.2.zip
+d0992257e66604bdacab1424a9fb7deb  eclipse-Automated-Tests-3.1.zip


--- eclipse-tests-3.0.spec DELETED ---


--- eclipse-tests-directories.3.0.patch DELETED ---


--- eclipse-tests-library.xml.3.0.patch DELETED ---


--- eclipse-tests-runtests.3.0.patch DELETED ---


--- eclipse-tests-test.xml.3.0.patch DELETED ---


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]