harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r784993 - /harmony/enhanced/jdktools/trunk/modules/samsa/build.xml
Date Mon, 15 Jun 2009 21:32:16 GMT
Author: hindessm
Date: Mon Jun 15 21:32:16 2009
New Revision: 784993

URL: http://svn.apache.org/viewvc?rev=784993&view=rev
Log:
Add some tests so we don't break "java -version" again.  (Still need to
make sure this is actually run.)

Modified:
    harmony/enhanced/jdktools/trunk/modules/samsa/build.xml

Modified: harmony/enhanced/jdktools/trunk/modules/samsa/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/samsa/build.xml?rev=784993&r1=784992&r2=784993&view=diff
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/samsa/build.xml (original)
+++ harmony/enhanced/jdktools/trunk/modules/samsa/build.xml Mon Jun 15 21:32:16 2009
@@ -164,10 +164,26 @@
 
         <echo message="Run jdk/bin/java -version in ${hy.tests.reports}"/>
         <exec failonerror="true"
-	        executable="${test.jre.home}/../bin/java${exe.suffix}"
-	        dir="${hy.tests.reports}">
+	      executable="${test.jre.home}/../bin/java${exe.suffix}"
+	      dir="${hy.tests.reports}"
+              outputproperty="java.out.text">
 	    <arg line="-version" />
         </exec>
+        <fail message="java -version should contain a copyright statement">
+            <condition>
+                <not>
+                    <contains string="${java.out.text}"
+                              substring="Copyright 1991"/>
+                </not>
+            </condition>
+        </fail>
+        <fail message="java -version should contain svn revision information">
+            <condition>
+                <not>
+                    <contains string="${java.out.text}" substring="svn = r"/>
+                </not>
+            </condition>
+        </fail>
 
         <echo message="Run jdk/bin/javac -version in ${hy.tests.reports}"/>
         <exec failonerror="true"



Mime
View raw message