You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by pa...@apache.org on 2015/10/24 15:43:28 UTC
[18/18] incubator-groovy git commit: try to fix up Apache CI build
server errors
try to fix up Apache CI build server errors
Project: http://git-wip-us.apache.org/repos/asf/incubator-groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-groovy/commit/05dab666
Tree: http://git-wip-us.apache.org/repos/asf/incubator-groovy/tree/05dab666
Diff: http://git-wip-us.apache.org/repos/asf/incubator-groovy/diff/05dab666
Branch: refs/heads/GROOVY_2_4_X
Commit: 05dab6667eab7aa4bd5d57003c7cf2cb19df058d
Parents: 0da4951
Author: paulk <pa...@asert.com.au>
Authored: Sat Oct 24 15:09:36 2015 +1000
Committer: pascalschumacher <pa...@gmx.net>
Committed: Sat Oct 24 15:42:33 2015 +0200
----------------------------------------------------------------------
.../groovy/runtime/m12n/ExtensionModuleHelperForTests.groovy | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/05dab666/src/test/org/codehaus/groovy/runtime/m12n/ExtensionModuleHelperForTests.groovy
----------------------------------------------------------------------
diff --git a/src/test/org/codehaus/groovy/runtime/m12n/ExtensionModuleHelperForTests.groovy b/src/test/org/codehaus/groovy/runtime/m12n/ExtensionModuleHelperForTests.groovy
index 1753c85..b2cb542 100644
--- a/src/test/org/codehaus/groovy/runtime/m12n/ExtensionModuleHelperForTests.groovy
+++ b/src/test/org/codehaus/groovy/runtime/m12n/ExtensionModuleHelperForTests.groovy
@@ -69,7 +69,7 @@ public class ExtensionModuleHelperForTests {
String out = ant.project.properties.out
String err = ant.project.properties.err
baseDir.deleteDir()
- if (err) {
+ if (err && err.trim() != 'Picked up JAVA_TOOL_OPTIONS: -Dfile.encoding=UTF-8') {
throw new RuntimeException("$err\nClasspath: ${cp.join('\n')}")
} else if ( out.contains('FAILURES') || ! out.contains("OK")) {
throw new RuntimeException("$out\nClasspath: ${cp.join('\n')}")