judovana / benchmarks-in-nested-virtualisation-toolchain

MIT License
0 stars 1 forks source link

avrora do not run with jdk21 #48

Open judovana opened 10 months ago

judovana commented 10 months ago
diff --git a/jenkins/benchmarks/dacapo.sh b/jenkins/benchmarks/dacapo.sh
index a7b82d66..2d49a7bb 100644
--- a/jenkins/benchmarks/dacapo.sh
+++ b/jenkins/benchmarks/dacapo.sh
@@ -84,7 +84,11 @@ function runSuite() {
 }

 ## get all suites
-SUITES=($( $JAVA -jar $DACAPO_JAR -l | grep -v -e "Started recording"  -e "copy recording data to file"  -e "^$"  -e "\[" || true))
+if  java -version 2>&1  | grep 21 ; then
+  SUITES=($( $JAVA -jar $DACAPO_JAR -l | grep -v -e "Started recording"  -e "copy recording data to file"  -e "^$"  -e "\[" | sed "s/batik//" | sed "s/h2//" | sed "s/eclipse//" | sed "s/tomcat//" | sed "s/tradesoap//" | sed "s/avrora//" || true))        
+else
+  SUITES=($( $JAVA -jar $DACAPO_JAR -l | grep -v -e "Started recording"  -e "copy recording data to file"  -e "^$"  -e "\[" | sed "s/batik//" | sed "s/h2//" | sed "s/eclipse//" | sed "s/tomcat//" | sed "s/tradesoap//" || true))
+fi

 set +x
judovana commented 10 months ago

if is necessary for dacapo

judovana commented 10 months ago

note, that there may be some jdk eg 11.0.5.21 which would match this. So the changeset is not completed

judovana commented 9 months ago

the hunk is now available in the in-tree diff, only disabled to not spoil jdk11u21