git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-629 Changed --newframe and --allframes to --new and --all. More consistent -...
[jalview.git]
/
build.gradle
diff --git
a/build.gradle
b/build.gradle
index
995d012
..
6a622c3
100644
(file)
--- a/
build.gradle
+++ b/
build.gradle
@@
-1748,7
+1748,6
@@
test {
// not running tests in this task
exclude "**/*"
// not running tests in this task
exclude "**/*"
-
}
/* testTask0 is the main test task */
task testTask0(type: Test) {
}
/* testTask0 is the main test task */
task testTask0(type: Test) {
@@
-1813,17
+1812,21
@@
tasks.withType(Test).matching {t -> t.getName().startsWith("testTask")}.all { te
testTask.mustRunAfter "testTask0"
testTask.testLogging { logging ->
testTask.mustRunAfter "testTask0"
testTask.testLogging { logging ->
- events TestLogEvent.FAILED,
- TestLogEvent.SKIPPED,
- TestLogEvent.STANDARD_OUT,
- TestLogEvent.STANDARD_ERROR
+ events TestLogEvent.FAILED
+// TestLogEvent.SKIPPED,
+// TestLogEvent.STANDARD_OUT,
+// TestLogEvent.STANDARD_ERROR
exceptionFormat TestExceptionFormat.FULL
showExceptions true
showCauses true
showStackTraces true
exceptionFormat TestExceptionFormat.FULL
showExceptions true
showCauses true
showStackTraces true
+
+ info.events = [ TestLogEvent.FAILED ]
}
}
+
+
ignoreFailures = true // Always try to run all tests for all modules
afterSuite { desc, result ->
ignoreFailures = true // Always try to run all tests for all modules
afterSuite { desc, result ->
@@
-1858,12
+1861,19
@@
tasks.withType(Test).matching {t -> t.getName().startsWith("testTask")}.all { te
// testTasks that include the tests, and exclude all from the others.
// get --test argument
filter.commandLineIncludePatterns = test.filter.commandLineIncludePatterns
// testTasks that include the tests, and exclude all from the others.
// get --test argument
filter.commandLineIncludePatterns = test.filter.commandLineIncludePatterns
+ // do something with testTask.getCandidateClassFiles() to see if the test should silently finish because of the
+ // commandLineIncludePatterns not matching anything. Instead we are doing setFailOnNoMatchingTests(false) below
+
if (useClover) {
println("Running tests " + (useClover?"WITH":"WITHOUT") + " clover")
}
}
if (useClover) {
println("Running tests " + (useClover?"WITH":"WITHOUT") + " clover")
}
}
+
+ /* don't fail on no matching tests (so --tests will run across all testTasks) */
+ testTask.filter.setFailOnNoMatchingTests(false)
+
/* ensure the "test" task dependsOn all the testTasks */
test.dependsOn testTask
}
/* ensure the "test" task dependsOn all the testTasks */
test.dependsOn testTask
}
@@
-1886,24
+1896,30
@@
private static String colString(styler, col, colour, text) {
private static String getSummaryLine(s, pn, tn, rt, rc, rs, rf, rsk, t, col) {
def colour = 'black'
private static String getSummaryLine(s, pn, tn, rt, rc, rs, rf, rsk, t, col) {
def colour = 'black'
+ def text = rt
def nocol = false
def nocol = false
- switch(rt) {
- case TestResult.ResultType.SUCCESS:
- colour = 'green'
- break;
- case TestResult.ResultType.FAILURE:
- colour = 'red'
- break;
- default:
- nocol = true
- break;
+ if (rc == 0) {
+ text = "-----"
+ nocol = true
+ } else {
+ switch(rt) {
+ case TestResult.ResultType.SUCCESS:
+ colour = 'green'
+ break;
+ case TestResult.ResultType.FAILURE:
+ colour = 'red'
+ break;
+ default:
+ nocol = true
+ break;
+ }
}
StringBuilder sb = new StringBuilder()
sb.append("${pn}")
if (tn != null)
sb.append(":${tn}")
sb.append(" results: ")
}
StringBuilder sb = new StringBuilder()
sb.append("${pn}")
if (tn != null)
sb.append(":${tn}")
sb.append(" results: ")
- sb.append(colString(s, col && !nocol, colour, rt))
+ sb.append(colString(s, col && !nocol, colour, text))
sb.append(" (")
sb.append("${rc} tests, ")
sb.append(colString(s, col && rs > 0, 'green', rs))
sb.append(" (")
sb.append("${rc} tests, ")
sb.append(colString(s, col && rs > 0, 'green', rs))