Return-Path: 
 <commits-return-58733-apmail-harmony-commits-archive=harmony.apache.org@harmony.apache.org>
Delivered-To: apmail-harmony-commits-archive@www.apache.org
Received: (qmail 99201 invoked from network); 15 Jun 2009 21:32:27 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3)
  by minotaur.apache.org with SMTP; 15 Jun 2009 21:32:27 -0000
Received: (qmail 74156 invoked by uid 500); 15 Jun 2009 21:32:39 -0000
Delivered-To: apmail-harmony-commits-archive@harmony.apache.org
Received: (qmail 74128 invoked by uid 500); 15 Jun 2009 21:32:39 -0000
Mailing-List: contact commits-help@harmony.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@harmony.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@harmony.apache.org>
List-Post: <mailto:commits@harmony.apache.org>
List-Id: <commits.harmony.apache.org>
Reply-To: dev@harmony.apache.org
Delivered-To: mailing list commits@harmony.apache.org
Received: (qmail 74116 invoked by uid 99); 15 Jun 2009 21:32:39 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 15 Jun 2009 21:32:39 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 15 Jun 2009 21:32:37 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id DFCD12388897; Mon, 15 Jun 2009 21:32:16 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r784993 -
 /harmony/enhanced/jdktools/trunk/modules/samsa/build.xml
Date: Mon, 15 Jun 2009 21:32:16 -0000
To: commits@harmony.apache.org
From: hindessm@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20090615213216.DFCD12388897@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

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"