Repository: incubator-groovy Updated Branches: refs/heads/master a90561fcd -> fc80b4e4a
fix check if test is running on builds.apache.org Project: http://git-wip-us.apache.org/repos/asf/incubator-groovy/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-groovy/commit/fc80b4e4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-groovy/tree/fc80b4e4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-groovy/diff/fc80b4e4 Branch: refs/heads/master Commit: fc80b4e4a23d936aa3d80fd71aaaff9fe8b5a264 Parents: a90561f Author: pascalschumacher <pascalschumac...@gmx.net> Authored: Fri Oct 23 20:47:09 2015 +0200 Committer: pascalschumacher <pascalschumac...@gmx.net> Committed: Fri Oct 23 20:47:09 2015 +0200 ---------------------------------------------------------------------- src/test/groovy/grape/GrapeIvyTest.groovy | 3 ++- src/test/groovy/lang/ClassReloadingTest.groovy | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/fc80b4e4/src/test/groovy/grape/GrapeIvyTest.groovy ---------------------------------------------------------------------- diff --git a/src/test/groovy/grape/GrapeIvyTest.groovy b/src/test/groovy/grape/GrapeIvyTest.groovy index 890ce3a..c1ecaa2 100644 --- a/src/test/groovy/grape/GrapeIvyTest.groovy +++ b/src/test/groovy/grape/GrapeIvyTest.groovy @@ -261,7 +261,8 @@ class GrapeIvyTest extends CompilableTestSupport { public void testClassifierWithConf() { assumeFalse('Test always fails on builds.apache.org on Windows, so we skip it there.', - new File('.').absolutePath =~ /jenkins|hudson/ && System.properties['os.name'].toLowerCase().contains('windows')) + (new File('.').absolutePath =~ /jenkins|hudson/).matches() && + System.properties['os.name'].toLowerCase().contains('windows')) def coreJars = [ "json-lib-2.2.3-jdk15.jar", http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/fc80b4e4/src/test/groovy/lang/ClassReloadingTest.groovy ---------------------------------------------------------------------- diff --git a/src/test/groovy/lang/ClassReloadingTest.groovy b/src/test/groovy/lang/ClassReloadingTest.groovy index d3d8400..d5f963d 100644 --- a/src/test/groovy/lang/ClassReloadingTest.groovy +++ b/src/test/groovy/lang/ClassReloadingTest.groovy @@ -26,7 +26,7 @@ class ClassReloadingTest extends GroovyTestCase { public void testReloading() { assumeFalse('Test always fails on builds.apache.org, so we skip it there.', - new File('.').absolutePath =~ /jenkins|hudson/) + (new File('.').absolutePath =~ /jenkins|hudson/).matches()) def file = File.createTempFile("TestReload", ".groovy", new File("target")) file.deleteOnExit()
