diff options
| author | Thomas Wolf <thomas.wolf@paranor.ch> | 2021-07-29 13:09:13 +0200 |
|---|---|---|
| committer | Thomas Wolf <thomas.wolf@paranor.ch> | 2021-07-29 13:09:39 +0200 |
| commit | 60bffc2fa830417b62de24cc6301906d4aa6bb5c (patch) | |
| tree | b921daeb4a9d8f8c6ebe9116955f1c338c0833c6 | |
| parent | 0c7b1013290f66450b3b14c4836a5495cefeb1e7 (diff) | |
| parent | ae56213210d5b0976b332d177df680d1b9a62f60 (diff) | |
| download | jgit-60bffc2fa830417b62de24cc6301906d4aa6bb5c.tar.gz jgit-60bffc2fa830417b62de24cc6301906d4aa6bb5c.zip | |
Merge branch 'stable-5.7' into stable-5.8
* stable-5.7:
[test] Create keystore with the keytool of the running JDK
ReachabilityCheckerTestCase: fix reachable from self test case
Change-Id: I32010c6bf45d5138e17143d6c284ac56434eade1
Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
| -rw-r--r-- | org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/AppServer.java | 5 | ||||
| -rw-r--r-- | org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/ReachabilityCheckerTestCase.java | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/AppServer.java b/org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/AppServer.java index 4e27a3d351..9239690f6b 100644 --- a/org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/AppServer.java +++ b/org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/AppServer.java @@ -181,9 +181,12 @@ public class AppServer { tmpDir.deleteOnExit(); makePrivate(tmpDir); File keyStore = new File(tmpDir, "keystore.jks"); + File keytool = new File( + new File(new File(System.getProperty("java.home")), "bin"), + "keytool"); Runtime.getRuntime().exec( new String[] { - "keytool", // + keytool.getAbsolutePath(), // "-keystore", keyStore.getAbsolutePath(), // "-storepass", keyPassword, "-alias", hostName, // diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/ReachabilityCheckerTestCase.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/ReachabilityCheckerTestCase.java index 4695eaa695..a129788d8b 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/ReachabilityCheckerTestCase.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/ReachabilityCheckerTestCase.java @@ -55,7 +55,7 @@ public abstract class ReachabilityCheckerTestCase assertReachable("reachable from another tip", checker.areAllReachable(Arrays.asList(a), Stream.of(b2))); assertReachable("reachable from itself", - checker.areAllReachable(Arrays.asList(a), Stream.of(b2))); + checker.areAllReachable(Arrays.asList(a), Stream.of(a))); } @Test |