Attachment 160092 Details for Bug 270627 – patch

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] patch

270627.txt (text/plain), 9.71 KB, created by Kim Moir

on 2010-02-24 13:22:17 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Kim Moir

Created: 2010-02-24 13:22:17 EST

Size: 9.71 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.releng.eclipsebuilder
>Index: eclipse/buildConfigs/sdk.tests/customTargets.xml
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/sdk.tests/customTargets.xml,v
>retrieving revision 1.33
>diff -u -r1.33 customTargets.xml
>--- eclipse/buildConfigs/sdk.tests/customTargets.xml	24 Nov 2009 16:58:04 -0000	1.33
>+++ eclipse/buildConfigs/sdk.tests/customTargets.xml	24 Feb 2010 18:21:01 -0000
>@@ -225,6 +225,9 @@
> 		
> 		<property file="${test.properties}" />
> 
>+		
>+		<copy file="${buildlogs}/comparatorlog.txt" todir="${workingDirectory}/eclipse-testing" failonerror="false"/>	
>+
> 		
> 		<property name="equinoxp2tests.properties" value="${workingDirectory}/eclipse-testing/equinoxp2tests.properties" />
> 		<property name="org.eclipse.equinox.p2.reconciler.tests.platform.archive.win32" value="c:\\buildtest\\${buildId}\\eclipse-testing\\eclipse-platform-${buildId}-win32.zip" />
>#P org.eclipse.releng.tests
>Index: compare.properties
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.tests/compare.properties,v
>retrieving revision 1.5
>diff -u -r1.5 compare.properties
>--- compare.properties	23 Jan 2009 22:29:23 -0000	1.5
>+++ compare.properties	24 Feb 2010 18:21:02 -0000
>@@ -11,4 +11,4 @@
> compare.new=@new@
> compare.old=@old@
> compare.output=@output@
>-compare.options=@compareoptions@
>+compare.options=@compareoptions@
>\ No newline at end of file
>Index: test.xml
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.tests/test.xml,v
>retrieving revision 1.65
>diff -u -r1.65 test.xml
>--- test.xml	19 Nov 2009 20:22:12 -0000	1.65
>+++ test.xml	24 Feb 2010 18:21:02 -0000
>@@ -67,7 +67,7 @@
> 		<property name="versionOutputFile" value="${versionOutputDir}/results.xml" />
> 		<echo message="locationcompare ${locationcompare} versionOutputDir ${versionOutputDir} versionOutputFile ${versionOutputFile}" />
> 		<replace file="${basedir}/plugins/${org.eclipse.releng.tests}/compare.properties" token="@output@" value="${versionOutputFile}" />
>-		<replace file="${basedir}/plugins/${org.eclipse.releng.tests}/compare.properties" token="@compareoptions@" value="${basedir}/plugins/${org.eclipse.releng.tests}/compareoptions.properties" />
>+		<replace file="${basedir}/plugins/${org.eclipse.releng.tests}/compare.properties" token="@compareoptions@" value="${basedir}/plugins/${org.eclipse.releng.tests}/compareoptions.properties" />		
> 	</target>
> 
> 
>@@ -86,7 +86,7 @@
> 			<property name="plugin-name" value="org.eclipse.releng.tests" />
> 			<property name="classname" value="org.eclipse.releng.tests.BuildTests" />
> 			<property name="plugin-path" value="${eclipse-home}/plugins/${org.eclipse.releng.tests}" />
>-			<property name="vmargs" value="-DRELENGTEST.JAVADOC.URLS=file:///${eclipse-home}/../../org.eclipse.platform.doc.isv.javadoc.txt,file:///${eclipse-home}/../../org.eclipse.jdt.doc.isv.javadoc.txt,file:///${eclipse-home}/../../org.eclipse.jdt.apt.javadoc.txt,file:///${eclipse-home}/../../org.eclipse.pde.doc.user.javadoc.txt" />
>+			<property name="vmargs" value="-DRELENGTEST.JAVADOC.URLS=file:///${eclipse-home}/../../org.eclipse.platform.doc.isv.javadoc.txt,file:///${eclipse-home}/../../org.eclipse.jdt.doc.isv.javadoc.txt,file:///${eclipse-home}/../../org.eclipse.jdt.apt.javadoc.txt,file:///${eclipse-home}/../../org.eclipse.pde.doc.user.javadoc.txt -DRELENGTEST.COMPARATOR.URL=file:///${eclipse-home}/../../comparatorlog.txt" />
> 		</ant>
> 	</target>
> 
>Index: src/org/eclipse/releng/tests/BuildTests.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.tests/src/org/eclipse/releng/tests/BuildTests.java,v
>retrieving revision 1.175
>diff -u -r1.175 BuildTests.java
>--- src/org/eclipse/releng/tests/BuildTests.java	24 Feb 2010 08:35:15 -0000	1.175
>+++ src/org/eclipse/releng/tests/BuildTests.java	24 Feb 2010 18:21:02 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2010 IBM Corporation and others.
>+ * Copyright (c) 2000, 2007 IBM Corporation and others.
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -35,15 +35,13 @@
> 
> import junit.framework.TestCase;
> 
>+import org.eclipse.core.runtime.FileLocator;
>+import org.eclipse.core.runtime.Platform;
> import org.osgi.framework.Bundle;
>-import org.xml.sax.SAXException;
>-
> import org.w3c.dom.Document;
> import org.w3c.dom.Element;
> import org.w3c.dom.NodeList;
>-
>-import org.eclipse.core.runtime.FileLocator;
>-import org.eclipse.core.runtime.Platform;
>+import org.xml.sax.SAXException;
> 
> public class BuildTests extends TestCase {
> 
>@@ -52,6 +50,7 @@
> 	private static final int PROPERTIES = 1;
> 	private static final int XML = 2;
> 	URL[] javadocLogs = null;
>+	URL comparatorLogs = null;
> 
> 	private static FileTool.IZipFilter getTrueFilter() {
> 		return new FileTool.IZipFilter() {
>@@ -403,14 +402,16 @@
> 	 */
> 	protected void setUp() throws Exception {
> 
>-		// Autoamted Test
>+		// Automated Test
> 		logFileName = Platform.getInstallLocation().getURL().getPath() + ".."
> 				+ File.separator + ".." + File.separator + "results"
> 				+ File.separator + "chkpii"; // A tad bogus but this is where
>-		// the build wants to copy the
>+    	// the build wants to copy the
> 		// results from!
> 
> 		String javadocUrls = System.getProperty("RELENGTEST.JAVADOC.URLS");
>+		String comparatorUrl = System.getProperty("RELENGTEST.COMPARATOR.URL");		
>+	
> 		if (javadocUrls != null) {
> 			String[] urls = javadocUrls.split(",");
> 			javadocLogs = new URL[urls.length];
>@@ -418,7 +419,9 @@
> 				javadocLogs[i] = new URL(urls[i]);
> 			}
> 		}
>-
>+		if (comparatorUrl != null) {
>+				comparatorLogs = new URL(comparatorUrl);
>+		}
> 		// Runtime Workbench - TODI Put me back to Automated status
> 		// logFileName = "d:\\results";
> 		// sourceDirectoryName = "d:\\sourceFetch";
>@@ -719,8 +722,82 @@
> 				}
> 			}
> 		}
>+	} 
>+ 
>+	
>+	public void testComparatorLogs() {
>+		
>+		String os = System.getProperty("os.name");
>+		
>+		// Only run compare tool on Linux to save time during tests 
>+			if (!os.equalsIgnoreCase("Linux")) {
>+				return;
>+			}
>+			
>+			// load the configuration and ensure the mandatory parameters were
>+			// specified
>+			Properties properties = loadCompareConfiguration();			
>+			String compareOldPath = properties.getProperty("compare.old");
>+			if (compareOldPath.indexOf("N2") > 0) { 
>+				// if nightly build, skip test
>+				return;
>+			}
>+		// skip this test if there are no logs to check
>+		if (comparatorLogs == null)
>+			assertTrue("", true);
>+		else {
>+			ComparatorLog comparatorLog = new ComparatorLog(comparatorLogs);
>+			String message = "comparator warnings in: \n";
>+			boolean problemLogsExist = comparatorLog.logs.size() > 0;			
>+			message = message
>+					.concat("See the comparator logs linked from the test results page for details");
>+			assertTrue(message, !problemLogsExist);
>+		}
>+	}
>+
>+	private class ComparatorLog {
>+		private ArrayList logs = new ArrayList();
>+
>+		private ComparatorLog(URL comparatorLogs) {
>+			findProblems(comparatorLogs);
>+		}
>+
>+		private void findProblems(URL ComparatorLogs) {
>+		
>+			String COMPARATOR_ERROR = "canonical:";		
>+
>+			BufferedReader in = null;
>+		
>+				try {
>+					in = new BufferedReader(new InputStreamReader(
>+							comparatorLogs.openStream()));
>+					String tmp;
>+					while ((tmp = in.readLine()) != null) {
>+						tmp = tmp.toLowerCase();
>+						if (tmp.indexOf(COMPARATOR_ERROR) != -1) {										
>+							String fileName = new File(comparatorLogs.getFile())
>+									.getName();
>+							if (!logs.contains(fileName))
>+								logs.add(fileName);
>+						}
>+					}
>+					in.close();
>+
>+				} catch (FileNotFoundException e) {
>+					logs.add("Unable to find "
>+							+ new File(comparatorLogs.getFile()).getName()
>+							+ " to read.");
>+					e.printStackTrace();
>+				} catch (IOException e) {
>+					logs.add("Unable to read "
>+							+ new File(comparatorLogs.getFile()).getName());
>+					e.printStackTrace();
>+				}
>+			}		
> 	}
> 
>+	
>+	
> 	/*
> 	 * Load the configuration file which should be included in this bundle
> 	 */
>@@ -862,8 +939,9 @@
> 		 * Determine if the build is a nightly Nightly builds have qualifiers
> 		 * identical the buildId - for instance N200612080010 which means that
> 		 * they are lower than v20060921-1945 from an promoted integration build
>-		 * and thus cannot be compared
>+		 * and thus cannot be compared 
> 		 */
>+		 
> 
> 		// disable temporarily
> 		if (compareOldPath.indexOf("N2") > 0) { 
>@@ -893,7 +971,7 @@
> 		
> 		String compareOptions = properties.getProperty("compare.options");
> 				
>-		/*
>+	/*	
> 		 * String outputFileName =
> 		 * Platform.getInstallLocation().getURL().getPath() + ".." +
> 		 * File.separator + ".." + File.separator + "results" + File.separator +
>@@ -904,8 +982,9 @@
> 		 * File(outputFileName); boolean created = outputfile.createNewFile();
> 		 * if (created) { } else { msg = "Output dir could not be created.";
> 		 * assertTrue(msg, msg == null); } } catch (IOException e) {
>-		 * e.printStackTrace(); }
>-		 */
>+		 * e.printStackTrace(); } 
>+*/
>+		 
> 
> 		String command = buildCommandLine(compareNewPath, compareOldPath,
> 				outputFileName, compareOptions);

Actions: View | Diff

Attachments on bug 270627: 131663 | 134823 | 151877 | 158315 | 160092 | 161608 | 161764 | 163636