Skip to content

Commit

Permalink
Added testrun for jcov
Browse files Browse the repository at this point in the history
three tests are failing, and I think it is due to testng and
jcommander version clash, but I had failed to set better versions
combinations.

This needs to be elaborate in upstream
  • Loading branch information
judovana committed Aug 15, 2023
1 parent 3277719 commit 4c457af
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 1 deletion.
2 changes: 1 addition & 1 deletion tools/code-tools/Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ def build(stageName) {
checkout([$class: 'GitSCM', branches: [[name: 'master']], doGenerateSubmoduleConfigurations: false, extensions: [[$class: 'RelativeTargetDirectory', relativeTargetDir: "${stageName}"]], submoduleCfg: [], userRemoteConfigs: [[url: toolsUrl]]])
}
sh label: "${stageName}", script: "./tools/code-tools/${stageName}.sh"
archiveArtifacts artifacts: "**/temurin-*-sbom.jar, ${stageName}/*.tar.gz, ${stageName}/${stageName}*.jar, ${stageName}/${stageName}*.jar.*.txt, ${stageName}/*.tar.gz.*sum*.txt, ${stageName}/${stageName}*.jar.html, ${stageName}/${stageName}*.jar.md, ${stageName}/${stageName}*.zip", followSymlinks: false
archiveArtifacts artifacts: "**/temurin-*-sbom.jar, ${stageName}/*.tar.gz, ${stageName}/${stageName}*.jar, ${stageName}/${stageName}*.jar.*.txt,${stageName}/${stageName}*.tar.gz.*.txt, ${stageName}/*.tar.gz.*sum*.txt, ${stageName}/${stageName}*.jar.html, ${stageName}/${stageName}*.jar.md, ${stageName}/${stageName}*.zip", followSymlinks: false
} catch (Exception e) {
slackSend channel: 'jenkins', color: 'danger', message: "${env.JOB_NAME} : #${env.BUILD_NUMBER} : ${stageName}() FAILED with following error message:\n${e}", teamDomain: 'adoptium'
throw new Exception("[ERROR] ${stageName} FAILED\n${e}")
Expand Down
11 changes: 11 additions & 0 deletions tools/code-tools/jcov.sh
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,16 @@ function getJavatest() {
sed "s/javatestjar.*/javatestjar=/g" -i build.properties
fi
fi
if [ ! -e testng.jar ] ; then
local testngv=6.9.10
wget https://repo1.maven.org/maven2/org/testng/testng/$testngv/testng-$testngv.jar
mv testng-$testngv.jar testng.jar
fi
if [ ! -e jcommander.jar ] ; then
local jcommanderv=1.81
wget https://repo1.maven.org/maven2/com/beust/jcommander/$jcommanderv/jcommander-$jcommanderv.jar
mv jcommander-$jcommanderv.jar jcommander.jar
fi
popd
}

Expand Down Expand Up @@ -134,6 +144,7 @@ pushd $REPO_DIR
getAsmDeps "9.0"
getJavatest
pushd build
ant $ASM_PROPS test | tee ../$main_file-$tip_shortened.tar.gz.txt || true
ant $ASM_PROPS build
popd
pushd $BUILD_PATH/jcov*/
Expand Down

0 comments on commit 4c457af

Please sign in to comment.