Browse Source

Correction build.xml pour avoir sonar + pitest

Arthur Brandao 6 years ago
parent
commit
689884fed0
1 changed files with 9 additions and 4 deletions
  1. 9 4
      build.xml

+ 9 - 4
build.xml

@@ -20,7 +20,7 @@
 	<property name="sonar.exclusions" value="**/*Test*" />
 	<property name="sonar.tests" value="TDD2019TESTS/src,TDD2019OWNTESTS/src" />
 	<property name="sonar.junit.reportPaths" value="${testreports}" />
-	<!--property name="sonar.jacoco.reportPaths" value="${testreports}/jacoco.exec" / Nouvelle ligne-->
+	<!--property name="sonar.jacoco.reportPaths" value="${testreports}/jacoco.exec" / ligne prof-->
 	<property name="sonar.jacoco.reportPath" value="${testreports}/jacoco.exec" />
     <property name="sonar.pitest.reportsDirectory" value="${testreports}" />
 	<property name="sonar.web.javaAdditionalOpts" value="-Dhttps.proxyHost=cache-etu.univ-artois.fr -Dhttps.proxyPort=3128" />
@@ -113,10 +113,15 @@
 		</jacoco:coverage>
 	</target>
 
-	<!--target name="m1" description="Verification des projets de TDD2019" depends="clean,build,tests,mutationCoverage" / Nouvelle ligne-->
-	<target name="m1" description="Verification des projets de TDD2019" depends="clean,build,tests" />
+	<!--target name="m1" description="Verification des projets de TDD2019" depends="clean,build,tests,mutationCoverage" / ligne prof-->
+	<target name="m1" description="Verification des projets de TDD2019" depends="clean,build,tests">
+		<subant failonerror="false" target="mutationCoverage">
+			<fileset dir="." includes="build.xml" />
+		</subant>
+	</target>
 
 	<!-- Define the SonarQube target -->
+	<!--target name="sonar" depends="m1" description="Analyse le code avec SonarQube" ligne prof-->
 	<target name="sonar" depends="m1" description="Analyse le code avec SonarQube">
 		<taskdef uri="antlib:org.sonar.ant" resource="org/sonar/ant/antlib.xml">
 			<classpath path="lib/sonarqube-ant-task-2.5.jar" />
@@ -130,8 +135,8 @@
 		<fail message="Il reste des tests qui ne passent pas !" if="tests.failure" />
 	</target>
 
+	<taskdef name="pitest" classname="org.pitest.ant.PitestTask" classpathref="mypath" />
     <target name="mutationCoverage">
-        <taskdef name="pitest" classname="org.pitest.ant.PitestTask" classpathref="mypath" />
         <pitest
               pitClasspath="mypath"
               classPath="mypath"