From d753488c0b966b215da67ed2f9246fe54637eebf Mon Sep 17 00:00:00 2001
From: Martin Oberhuber < martin.oberhuber@windriver.com>
Date: Wed, 13 Feb 2008 22:39:22 +0000
Subject: [PATCH] Fix copying Terminal Prereq for Testing

---
 .../builder/tests/configs/local/customTest.xml              | 5 +++--
 releng/org.eclipse.tm.releng/builder/tests/scripts/test.xml | 6 ++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/releng/org.eclipse.tm.releng/builder/tests/configs/local/customTest.xml b/releng/org.eclipse.tm.releng/builder/tests/configs/local/customTest.xml
index 7da49f7dd9c..af4eb457936 100644
--- a/releng/org.eclipse.tm.releng/builder/tests/configs/local/customTest.xml
+++ b/releng/org.eclipse.tm.releng/builder/tests/configs/local/customTest.xml
@@ -24,9 +24,10 @@
 		<!-- TODO: if your project requires more dependencies for testing, add them here -->
 		<echo message="Copy EMF SDK + Eclipse SDK to ${executionDir}..."/>
 		<copy todir="${executionDir}">
-			<!--TODO: Main runtime is RSE, therefore need to copy TM-terminal and others to test as well-->
 			<!--<fileset dir="${downloadsDir}" includes="${emfFile},${eclipseFile},${wtpFile},${orbitFile}"/>-->
-			<fileset dir="${downloadsDir}" includes="${emfFile},${eclipseFile},${orbitFile},TM-terminal-*"/>
+			<fileset dir="${downloadsDir}" includes="${emfFile},${eclipseFile},${orbitFile}"/>
+			<!--TODO: Main runtime is RSE, therefore need to copy TM-terminal and others to test as well-->
+			<fileset dir="${testDir}/../.." includes="TM-terminal-*.zip"/>
 		</copy>
 		<property name="shell" value="relengbuildgtk.sh"/>
 	
diff --git a/releng/org.eclipse.tm.releng/builder/tests/scripts/test.xml b/releng/org.eclipse.tm.releng/builder/tests/scripts/test.xml
index e5955069efd..0583e3d30c2 100644
--- a/releng/org.eclipse.tm.releng/builder/tests/scripts/test.xml
+++ b/releng/org.eclipse.tm.releng/builder/tests/scripts/test.xml
@@ -44,8 +44,10 @@
 		<property name="dir" location="."/>
 		<echo message="Unpack SDK + JUnit Tests (${dir}/RSE-*.zip) ..."/>		
 		<unzip dest="${install}" overwrite="true">
-		    <fileset dir="${dir}"><include name="**/RSE-*.zip"/></fileset>
-		    <fileset dir="${dir}"><include name="**/TM-terminal-*.zip"/></fileset>
+		    <fileset dir="${dir}">
+		    	<include name="**/RSE-*.zip"/>
+		    	<include name="**/TM-terminal-*.zip"/>
+		    </fileset>
 		</unzip>
 	</target>