Merge remote-tracking branch 'origin/GT-3099_adamopolous_gitlab_ci_setup' into Ghidra_9.1

This commit is contained in:
Ryan Kurtz 2019-09-16 12:23:54 -04:00
commit 6174b1e5ae
3 changed files with 16 additions and 1 deletions

14
.gitlab-ci.yml Normal file
View file

@ -0,0 +1,14 @@
stages:
- test
test-parallel:
stage: test
script:
- echo $REPO_TOKEN
- "curl -X POST -F token=$REPO_TOKEN -F ref=$CI_COMMIT_REF_NAME $REPO_URL"
tags:
- docker
- ghidratest
image: ghidra/ubuntu
only:
- master

View file

@ -1,6 +1,7 @@
##VERSION: 2.0
.gitattributes||GHIDRA|exclude|||END|
.gitignore||GHIDRA|exclude|||END|
.gitlab-ci.yml||GHIDRA||||END|
CONTRIBUTING.md||GHIDRA||||END|
DISCLAIMER.md||GHIDRA||||END|
DevGuide.md||GHIDRA||||END|

View file

@ -89,7 +89,7 @@ def Map<String, Map<String, Long>> getTestReport() {
if(!classesReportDir.exists()) {
logger.info("getTestReport: The path '$testTimeParserInputDir' does not exist on the file system." +
" Returning empty testReport map.")
return Collections.emptyList();
return Collections.emptyMap();
}
// These are the configuration 'buckets' that each test class will be dumped