X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=build.xml;h=8a89b89de408fbd986d595e8439605110f4c41c4;hb=d1d65cf8d10e92d7ef3ab5812a145925bd8e63d1;hp=630a0117d3594dad0980c3abfc0e77db0a89a989;hpb=b740091dd017149ce711f5d2da0f0996aa4345a7;p=gigi.git

diff --git a/build.xml b/build.xml
index 630a0117..8a89b89d 100644
--- a/build.xml
+++ b/build.xml
@@ -6,16 +6,17 @@
     <property name="target" value="1.8"/>
     <property name="source" value="1.8"/>
     <property name="mysqlconnector" value="mysql-connector-java-5.1.31-bin.jar"/>
-    <property name="juintexec" value="junit.jar"/>
+    <property name="juintexec" value="."/>
     <path id="JUnit 4.libraryclasspath">
-        <pathelement location="${juintexec}"/>
+        <pathelement location="${juintexec}/junit.jar"/>
+        <pathelement location="${juintexec}/org.hamcrest.core.jar"/>
     </path>
     <path id="cacert-gigi.classpath">
         <pathelement location="bin"/>
-        <path refid="JUnit 4.libraryclasspath"/>
         <pathelement location="${mysqlconnector}"/>
     </path>
     <path id="cacert-gigi.test.classpath">
+        <pathelement location="bin"/>
         <pathelement location="bintest"/>
         <path refid="JUnit 4.libraryclasspath"/>
         <pathelement location="${mysqlconnector}"/>
@@ -66,6 +67,7 @@
         <javac debug="true" debuglevel="${debuglevel}" destdir="bin" includeantruntime="false" source="${source}" target="${target}">
             <src path="lib/servlet-api"/>
             <src path="lib/jetty"/>
+            <src path="lib/jtar"/>
             <src path="src"/>
             <src path="util"/>
             <classpath refid="cacert-gigi.classpath"/>
@@ -89,13 +91,24 @@
             <classpath refid="cacert-gigi.classpath"/>
         </java>
     </target>
-    <target name="test" depends="build-project-test">
+
+    <target name="check-generateKeys">
+        <available file="config/keystore.pkcs12" property="keystore.present"/>
+    </target>
+    <target name="generateKeys" depends="check-generateKeys" unless="keystore.present">
+        <exec executable="./generateKeys.sh" dir="doc/scripts"/>
+        <exec executable="./generateTruststore.sh" dir="doc/scripts">
+            <arg value="-noprompt"/>
+        </exec>
+    </target>
+    <target name="test" depends="build-project-test,generateKeys">
         <mkdir dir="${junit.output.dir}"/>
         <junit fork="yes" printsummary="withOutAndErr">
             <formatter type="xml"/>
             <test name="org.cacert.gigi.TestSSL" todir="${junit.output.dir}"/>
-            <test name="org.cacert.gigi.pages.main.ResgisterPageTest" todir="${junit.output.dir}"/>
-            <classpath refid="cacert-gigi.classpath"/>
+            <test name="org.cacert.gigi.LoginTest" todir="${junit.output.dir}"/>
+            <test name="org.cacert.gigi.pages.main.RegisterPageTest" todir="${junit.output.dir}"/>
+            <classpath refid="cacert-gigi.test.classpath"/>
         </junit>
     </target>
     <target name="junitreport">