Community
Participate
Working Groups
When running tests from Maven the test MergeToolTest#testEmptyToolName fails with the error: org.eclipse.jgit.pgm.test (master)]$ mvn test -Dtest=MergeToolTest#testEmptyToolName [ERROR] MergeToolTest.testEmptyToolName:94->ToolTestCase.runAndCaptureUsingInitRaw:76->ToolTestCase.runAndCaptureUsingInitRaw:109 Expected no standard error output from tool expected:<[[compare: unrecognized option `-wait' @ error/compare.c/CompareImageCommand/1123., compare: unrecognized option `-wait' @ error/compare.c/CompareImageCommand/1123.]]> but was:<[[JGit: tool execution return code: 1, checkExitCode: true, execError: false, stderr: , emacs: standard input is not a tty, merge of dir1/a failed, JGit: tool execution return code: 1, checkExitCode: true, execError: false, stderr: , emacs: standard input is not a tty, merge of dir2/b failed]]> running the test MergeToolTest#testEmptyToolName from Eclipse 4.24 fails with a different error: org.junit.ComparisonFailure: Expected no standard error output from tool expected:<[[compare: unrecognized option `-wait' @ error/compare.c/CompareImageCommand/1123., compare: unrecognized option `-wait' @ error/compare.c/CompareImageCommand/1123.]]> but was:<[[xcode-select: error: tool 'opendiff' requires Xcode, but active developer directory '/Library/Developer/CommandLineTools' is a command line tools instance, xcode-select: error: tool 'opendiff' requires Xcode, but active developer directory '/Library/Developer/CommandLineTools' is a command line tools instance]]> at org.junit.Assert.assertEquals(Assert.java:117) at org.eclipse.jgit.pgm.ToolTestCase.runAndCaptureUsingInitRaw(ToolTestCase.java:109) at org.eclipse.jgit.pgm.ToolTestCase.runAndCaptureUsingInitRaw(ToolTestCase.java:76) at org.eclipse.jgit.pgm.MergeToolTest.testEmptyToolName(MergeToolTest.java:94) at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.base/java.lang.reflect.Method.invoke(Method.java:566) at org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:59) at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12) at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:56) at org.junit.internal.runners.statements.InvokeMethod.evaluate(InvokeMethod.java:17) at org.junit.internal.runners.statements.RunBefores.evaluate(RunBefores.java:26) at org.junit.internal.runners.statements.RunAfters.evaluate(RunAfters.java:27) at org.junit.rules.TestWatcher$1.evaluate(TestWatcher.java:61) at org.junit.runners.ParentRunner$3.evaluate(ParentRunner.java:306) at org.junit.runners.BlockJUnit4ClassRunner$1.evaluate(BlockJUnit4ClassRunner.java:100) at org.junit.runners.ParentRunner.runLeaf(ParentRunner.java:366) at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:103) at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:63) at org.junit.runners.ParentRunner$4.run(ParentRunner.java:331) at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:79) at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:329) at org.junit.runners.ParentRunner.access$100(ParentRunner.java:66) at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:293) at org.junit.runners.ParentRunner$3.evaluate(ParentRunner.java:306) at org.junit.runners.ParentRunner.run(ParentRunner.java:413) at org.eclipse.jdt.internal.junit4.runner.JUnit4TestReference.run(JUnit4TestReference.java:93) at org.eclipse.jdt.internal.junit.runner.TestExecution.run(TestExecution.java:40) at org.eclipse.jdt.internal.junit.runner.RemoteTestRunner.runTests(RemoteTestRunner.java:529) at org.eclipse.jdt.internal.junit.runner.RemoteTestRunner.runTests(RemoteTestRunner.java:756) at org.eclipse.jdt.internal.junit.runner.RemoteTestRunner.run(RemoteTestRunner.java:452) at org.eclipse.jdt.internal.junit.runner.RemoteTestRunner.main(RemoteTestRunner.java:210)
New Gerrit change created: https://git.eclipse.org/r/c/jgit/jgit/+/194232
Gerrit change https://git.eclipse.org/r/c/jgit/jgit/+/194232 was merged to [master]. Commit: http://git.eclipse.org/c/jgit/jgit.git/commit/?id=0c32889ebcc61845765514fee56d6641bd91b542