LPS-22437

xieh · Oct 24, 2011 · a831316 · a831316
1 parent a595618
commit a831316
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 1 deletion.
diff --git a/build-test.xml b/build-test.xml
@@ -236,7 +236,7 @@
 	</target>
 
 	<target name="build-test-ant-scripts">
-		<property name="build-test-ant-scripts.version" value="5" />
+		<property name="build-test-ant-scripts.version" value="6" />
 
 		<if>
 			<available file="portal-web/test-ant-scripts/version" />

diff --git a/portal-web/test-ant-templates/ant-script-lar.xml b/portal-web/test-ant-templates/ant-script-lar.xml
@@ -49,6 +49,29 @@
 		</ant>
 	</target>
 
+	<target name="test-${test.ant.script.command}-jetty-mysql-firefox">
+		<antcall target="prepare-mysql">
+			${test.ant.script.file.properties}
+		</antcall>
+
+		<ant antfile="build-test-jetty.xml" target="run-selenium-jetty">
+			${test.ant.script.file.plugin.hooks}
+			${test.ant.script.file.plugin.portlets}
+			${test.ant.script.file.plugin.themes}
+			${test.ant.script.file.plugin.webs}
+			<property name="test.name" value="${test.ant.script.suite.1}" />
+		</ant>
+
+		<ant antfile="build-test-jetty.xml" target="run-selenium-jetty">
+			${test.ant.script.file.plugin.hooks}
+			${test.ant.script.file.plugin.portlets}
+			${test.ant.script.file.plugin.themes}
+			${test.ant.script.file.plugin.webs}
+			<property name="skip.delete-selenium-output" value="true" />
+			<property name="test.name" value="${test.ant.script.suite.2}" />
+		</ant>
+	</target>
+
 	<target name="test-${test.ant.script.command}-jboss-mysql-firefox">
 		<antcall target="prepare-mysql">
 			${test.ant.script.file.properties}

diff --git a/portal-web/test-ant-templates/ant-script.xml b/portal-web/test-ant-templates/ant-script.xml
@@ -35,6 +35,22 @@
 		</ant>
 	</target>
 
+	<target name="test-${test.ant.script.command}-jetty-mysql-firefox">
+		<antcall target="prepare-mysql">
+			${test.ant.script.file.properties}
+		</antcall>
+
+		<ant antfile="build-test-jetty.xml" target="run-selenium-jetty">
+			${test.ant.script.file.database.minimal}
+			${test.ant.script.file.plugin.hooks}
+			${test.ant.script.file.plugin.layouttpls}
+			${test.ant.script.file.plugin.portlets}
+			${test.ant.script.file.plugin.themes}
+			${test.ant.script.file.plugin.webs}
+			<property name="test.name" value="${test.ant.script.suite}" />
+		</ant>
+	</target>
+
 	<target name="test-${test.ant.script.command}-jboss-mysql-firefox">
 		<antcall target="prepare-mysql">
 			${test.ant.script.file.properties}