Profiling update

.gitlab-ci.yml

@@ -117,7 +117,7 @@ evoal:unit:
     reports:
       junit: src/evoal/*/*/target/surefire-reports/TEST-*.xml
     paths:
-      - src/evoal/core/de.evoal.releng.jacoco/target/site/jacoco-aggregate/jacoco.xml
+      - src/evoal/*/*/target/site/jacoco-aggregate/jacoco.xml
       - src/evoal/*/*/target/surefire-reports/TEST-*.xml
 
 evoal:coverage:
@@ -127,7 +127,7 @@ evoal:coverage:
   image: haynes/jacoco2cobertura:1.0.7
   script:
     - jacoco_paths=`find src -path "**/src/main/java" -type d | sed -e 's@^@'"$CI_PROJECT_DIR"'/@'`
-    - python /opt/cover2cover.py src/evoal/core/de.evoal.releng.jacoco/target/aggregate.xml $jacoco_paths > src/evoal/core/de.evoal.releng.jacoco/target/site/coverage.xml
+    - python /opt/cover2cover.py src/evoal/core/de.evoal.releng.jacoco/target/site/jacoco-aggregate/jacoco.xml $jacoco_paths > src/evoal/core/de.evoal.releng.jacoco/target/site/coverage.xml
   needs: ["evoal:unit"]
   dependencies:
     - evoal:unit

ci/regression-coverage.sh

@@ -2,12 +2,12 @@ JACOCO_PATH=/Users/berber/bin/jacoco
 
 echo "Downloading Jacoco-Agent"
 mvn org.apache.maven.plugins:maven-dependency-plugin:2.1:get -Dmaven.repo.local=${CI_PROJECT_DIR}/.m2/repository -Dartifact=org.jacoco:org.jacoco.agent:0.8.10 -DrepoUrl=https://repo.maven.apache.org/maven2/
-mvn org.apache.maven.plugins:maven-dependency-plugin:2.1:get -Dmaven.repo.local=${CI_PROJECT_DIR}/.m2/repository -Dartifact=org.jacoco:org.jacoco.cli:0.8.10 -DrepoUrl=https://repo.maven.apache.org/maven2/
 
 pushd evoal/examples
 
 export EVOAL_VM=-javaagent:${CI_PROJECT_DIR}/.m2/repository/org/jacoco/org.jacoco.agent/0.8.10/org.jacoco.agent-0.8.10-runtime.jar=dumponexit=true
 
+set -e
 for EXAMPLE in *; do
     if [ ! -d $EXAMPLE ]; then
       continue
@@ -21,8 +21,4 @@ for EXAMPLE in *; do
     popd
 
 done
-
-EXECS=$( find . -name "*exec")
-java -jar $JACOCO_PATH/lib/jacococli.jar merge $EXECS --destfile output.execb
-
 popd
\ No newline at end of file

src/evoal/core/de.evoal.releng.jacoco/pom.xml

@@ -99,12 +99,6 @@
                                 </goals>
                                 <configuration>
                                 <fileSets>
-                                    <fileSet>
-                                        <directory>.</directory>
-                                        <includes>
-                                            <include>**/target/jacoco.exec</include>
-                                        </includes>
-                                    </fileSet>
                                     <fileSet>
                                         <directory>../../evoal/examples</directory>
                                         <includes>
@@ -112,7 +106,7 @@
                                         </includes>
                                     </fileSet>
                                 </fileSets>
-                                <destFile>target/aggregate.exec</destFile>
+                                <destFile>target/regression.exec</destFile>
                                 </configuration>
                             </execution>
                         </executions>