[jboss-cvs] JBossAS SVN: r76289 - in branches/JBPAPP_4_3_0_GA_CC/testsuite: imports and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: pskopek at redhat.com
Date: 2008-07-28 05:08:05 -0400 (Mon, 28 Jul 2008)
New Revision: 76289

Modified:
   branches/JBPAPP_4_3_0_GA_CC/testsuite/build.xml
   branches/JBPAPP_4_3_0_GA_CC/testsuite/imports/server-config.xml
Log:
JBOSSCC-12: New configurations added.

Modified: branches/JBPAPP_4_3_0_GA_CC/testsuite/build.xml
===================================================================
--- branches/JBPAPP_4_3_0_GA_CC/testsuite/build.xml	2008-07-28 06:59:34 UTC (rev 76288)
+++ branches/JBPAPP_4_3_0_GA_CC/testsuite/build.xml	2008-07-28 09:08:05 UTC (rev 76289)
@@ -843,6 +843,79 @@
     <record name="${basedir}/build.log" action="stop"/>
   </target>
 
+	
+  <!-- Common Criteria Evaluation Tests running with Java Security Manager turned on. 
+  -->	
+  <target name="tests-cc-sm" description="Execute all Common Criteria Evaluation tests with Java Security Manager turned on." 
+  	depends="maybejars">
+
+  	<record name="${basedir}/build.log" append="no" action="start" loglevel="${buildlog.level}"/>
+    <property name="nojars" value="true"/>
+
+    <server:start name="cc-sm"/>
+    
+  	<antcall target="run-cc-tests"/>
+
+  	<antcall target="tests-report"/>
+
+    <echo>Waiting for server to shutdown...</echo>
+  	<server:stop name="cc-sm"/>
+  	
+    <record name="${basedir}/build.log" action="stop"/>
+  	
+  </target>
+  	
+  <!-- Common Criteria Evaluation Tests running with Java Security Manager turned off. 
+  -->	
+  <target name="tests-cc-no-sm" description="Execute all Common Criteria Evaluation tests with Java Security Manager turned off." 
+  	depends="maybejars">
+
+  	<record name="${basedir}/build.log" append="no" action="start" loglevel="${buildlog.level}"/>
+    <property name="nojars" value="true"/>
+
+  	<server:start name="cc"/>
+    
+  	<antcall target="run-cc-tests"/>
+
+  	<antcall target="tests-report"/>
+  	
+    <echo>Waiting for server to shutdown...</echo>
+  	<server:stop name="cc"/>
+
+  	<record name="${basedir}/build.log" action="stop"/>
+	
+  </target>
+	
+  <!-- Collection of all CC related tests.
+       Called from both tests-cc-sm and tests-cc-no-sm targets.
+       Server has to be already started with proper configuration. 
+  -->
+  <target name="run-cc-tests">
+    <antcall target="tests-security-basic-unit"/>
+    <antcall target="tests-security-manager-cc"/>
+  </target>
+	
+  <target name="tests-security-manager-cc" description="Tests run against a jboss server with a security manager for CC Evaluation">
+
+    <property name="jboss.home" location="${project.root}"/>
+    <property name="jboss.thirdparty.dir" location="${project.root}/thirdparty"/>
+    <property name="jboss.tools.dir" location="${project.root}/tools"/>
+    <property name="jbosstest.secure" value="true"/>
+    <property name="java.security.auth.login.config" value="${build.resources}/security/auth.conf"/>
+    <propertyset id="tests-security-manager-props">
+      <propertyref prefix="java.security"/>
+      <propertyref prefix="jboss"/>
+    </propertyset>
+
+    <patternset id="test.includes">
+      <exclude name="org/jboss/test/securitymgr/test/PolicyUnitTestCase.class"/>
+      <patternset refid="securitymgr.includes"/>
+    </patternset>
+    <run-junit junit.patternset="test.includes" junit.syspropertyset="tests-security-manager-props" junit.configuration="tests-security-manager"/>
+
+  </target> 
+  
+  
   <target name="tests-unified">
     <create-unifiedInvoker-server conf="unified-jboss" serial="jboss"/>
     <replace file="${jboss.dist}/server/unified-jboss/conf/standardjboss.xml">
@@ -1857,6 +1930,9 @@
     <run-junit junit.patternset="security.includes" junit.configuration="tests-security-basic-unit" junit.syspropertyset="security-tests-props"/>
   </target>
 
+  
+	
+	
   <!-- Tests of Java2 permissions. The JBoss server must be running with
   a security manager for this test -->
   <target name="tests-security-manager" description="Tests run against a jboss server with a security manager">

Modified: branches/JBPAPP_4_3_0_GA_CC/testsuite/imports/server-config.xml
===================================================================
--- branches/JBPAPP_4_3_0_GA_CC/testsuite/imports/server-config.xml	2008-07-28 06:59:34 UTC (rev 76288)
+++ branches/JBPAPP_4_3_0_GA_CC/testsuite/imports/server-config.xml	2008-07-28 09:08:05 UTC (rev 76289)
@@ -319,7 +319,23 @@
        <sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
        <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
     </server>
-   </server:config>
+    <server name="cc" host="${node0}" config="cc">
+       <jvmarg value="${jpda.cmdline}" />
+       <jvmarg value="-Xmx128m" />
+       <jvmarg value="-XX:MaxPermSize=128m" />
+       <sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
+       <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
+    </server>
+    <server name="cc-sm" host="${node0}" config="cc">
+       <jvmarg value="${jpda.cmdline}" />
+       <jvmarg value="-Xmx128m" />
+       <jvmarg value="-XX:MaxPermSize=128m" />
+       <jvmarg value="-Djava.security.manager"/>
+       <jvmarg value="-Djava.security.policy=${jboss.dist}/bin/security_cc.policy"/>
+       <sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
+       <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
+    </server>
+  </server:config>
 
     <!-- A macro for printing sleep before going into sleep
    -->