From f72b26f2d3776c72889a481f975c1add49980697 Mon Sep 17 00:00:00 2001 From: Robin Rosenberg Date: Tue, 21 Aug 2012 18:17:31 +0200 Subject: [PATCH 1/2] Skip a test that cannot be verified on Windows Change-Id: I1d1ed122c714f39ca7fb557224756205274804eb --- .../tst/org/eclipse/jgit/api/CommitAndLogCommandTests.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CommitAndLogCommandTests.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CommitAndLogCommandTests.java index ed32e27b0..6424f1c5d 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CommitAndLogCommandTests.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CommitAndLogCommandTests.java @@ -256,6 +256,8 @@ public class CommitAndLogCommandTests extends RepositoryTestCase { @Test public void testModeChange() throws IOException, GitAPIException { + if (System.getProperty("os.name").startsWith("Windows")) + return; // SKIP Git git = new Git(db); // create file From c4bc9c709a7bc8a7aec78a5bbe20ef52966a8b20 Mon Sep 17 00:00:00 2001 From: Robin Rosenberg Date: Tue, 21 Aug 2012 18:21:17 +0200 Subject: [PATCH 2/2] The Git API's only likes /, not \ in paths Therefore this test fails on Windows Change-Id: I4f73487b720ea1479e95108344f1dc3711106408 --- .../tst/org/eclipse/jgit/api/StashApplyCommandTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/StashApplyCommandTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/StashApplyCommandTest.java index 117ef88dc..e7d66fb7f 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/StashApplyCommandTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/StashApplyCommandTest.java @@ -425,7 +425,7 @@ public class StashApplyCommandTest extends RepositoryTestCase { public void stashChangeInANewSubdirectory() throws Exception { String subdir = "subdir"; String fname = "file2.txt"; - String path = subdir + System.getProperty("file.separator") + fname; + String path = subdir + "/" + fname; String otherBranch = "otherbranch"; writeTrashFile(subdir, fname, "content2");