From 00257fb5de14c4a12cd56121b9854a892b0f0f47 Mon Sep 17 00:00:00 2001
From: Peter Graves <pgraves@qnx.com>
Date: Wed, 11 Jun 2003 18:47:32 +0000
Subject: [PATCH] Minor update to make automation easier.

---
 core/org.eclipse.cdt.ui.tests/ChangeLog |  4 ++++
 core/org.eclipse.cdt.ui.tests/test.xml  | 10 +++++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/core/org.eclipse.cdt.ui.tests/ChangeLog b/core/org.eclipse.cdt.ui.tests/ChangeLog
index 9114b3394c1..90d5c18ccac 100644
--- a/core/org.eclipse.cdt.ui.tests/ChangeLog
+++ b/core/org.eclipse.cdt.ui.tests/ChangeLog
@@ -1,3 +1,7 @@
+3003-06-11 Peter Graves
+    Update the test.xml to get the location of org.eclipse.test from a property
+    if set. If the property is not set, it will default to the old value.
+    
 2003-06-11 Victor Mozgin
 	Old Java TestCase.txt and TestCase2.txt for partioning testing have been replaced with C/C++ files.
 	Modified AutomatedIntegrationSuite.java so it doesn't produce JUnit warning anymore.
diff --git a/core/org.eclipse.cdt.ui.tests/test.xml b/core/org.eclipse.cdt.ui.tests/test.xml
index 31b571cf8e5..5b92d6dee5a 100644
--- a/core/org.eclipse.cdt.ui.tests/test.xml
+++ b/core/org.eclipse.cdt.ui.tests/test.xml
@@ -3,13 +3,17 @@
 <project name="testsuite" default="run" basedir=".">
   <!-- The property ${eclipse-home} should be passed into this script -->
   <!-- Set a meaningful default value for when it is not. -->
-<!--  <property name="eclipse-home" value="${basedir}\..\.."/> -->
   <property name="eclipse-home" value="${basedir}"/>
-
+  
+  <!-- This is the default name of the org.eclipse.test plugin. -->
+  <!-- We need to be able to override this for the case where the -->
+  <!-- org.eclipse.test plugin was build as part of a feature and -->
+  <!-- will have a name similar to org.eclipse.test_2.1.0  -->
+  <property name="org.eclipse.test" value="org.eclipse.test"/>
   <!-- sets the properties eclipse-home, and library-file -->
   <property name="plugin-name" value="org.eclipse.cdt.ui.tests"/>
   <property name="library-file"
-            value="${eclipse-home}/plugins/org.eclipse.test/library.xml"/>
+            value="${eclipse-home}/plugins/${org.eclipse.test}/library.xml"/>
 
   <!-- This target holds all initialization code that needs to be done for -->
   <!-- all tests that are to be run. Initialization for individual tests -->