diff options
| author | David Pursehouse <david.pursehouse@gmail.com> | 2016-09-22 11:26:28 +0200 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2016-10-18 01:06:28 +0200 |
| commit | e0d1cfb5ad8d8504327458fca39ee9856755c14b (patch) | |
| tree | d31d677f893b112e82dc0e564bdf60c07cf801b8 | |
| parent | fb4abc7f86938b9e20812cd7a93cf0b3fcf7c6ea (diff) | |
| download | jgit-e0d1cfb5ad8d8504327458fca39ee9856755c14b.tar.gz jgit-e0d1cfb5ad8d8504327458fca39ee9856755c14b.zip | |
Upgrade buck to 7b7817c48f30687781040b2b82ac9218d5c4eaa4
Upgrade to match the version used on Gerrit's master branch.
Requires a couple of modifications to make the tests work:
- Remove source_under_test parameters from java_test calls.
- Add vm_args with explicit setting of tmpdir location for http
tests. This is needed due to upstream changes in temporary
directory handling [1].
[1] https://github.com/facebook/buck/issues/946
Change-Id: I5d5dd5edc335d44b118e8587f69ba89b83fc7fbb
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
| -rw-r--r-- | .buckversion | 2 | ||||
| -rw-r--r-- | org.eclipse.jgit.http.test/BUCK | 2 | ||||
| -rw-r--r-- | org.eclipse.jgit.lfs.server.test/BUCK | 1 | ||||
| -rw-r--r-- | org.eclipse.jgit.lfs.test/BUCK | 1 | ||||
| -rw-r--r-- | org.eclipse.jgit.pgm.test/BUCK | 1 | ||||
| -rw-r--r-- | org.eclipse.jgit.test/BUCK | 1 |
6 files changed, 2 insertions, 6 deletions
diff --git a/.buckversion b/.buckversion index f5fe016979..af38772e58 100644 --- a/.buckversion +++ b/.buckversion @@ -1 +1 @@ -e64a2e2ada022f81e42be750b774024469551398 +7b7817c48f30687781040b2b82ac9218d5c4eaa4 diff --git a/org.eclipse.jgit.http.test/BUCK b/org.eclipse.jgit.http.test/BUCK index d65cdadfc2..f5cd10e58b 100644 --- a/org.eclipse.jgit.http.test/BUCK +++ b/org.eclipse.jgit.http.test/BUCK @@ -25,7 +25,7 @@ for t in TESTS: '//lib/jetty:util', '//lib:commons-logging', ], - source_under_test = ['//org.eclipse.jgit.http.server:jgit-servlet'], + vm_args = ['-Djava.io.tmpdir=buck-out'], ) java_library( diff --git a/org.eclipse.jgit.lfs.server.test/BUCK b/org.eclipse.jgit.lfs.server.test/BUCK index 9d6e72fcf5..25e9f09c18 100644 --- a/org.eclipse.jgit.lfs.server.test/BUCK +++ b/org.eclipse.jgit.lfs.server.test/BUCK @@ -30,6 +30,5 @@ for t in TESTS: '//lib:servlet-api', '//lib:commons-logging', ], - source_under_test = ['//org.eclipse.jgit.lfs.server:jgit-lfs-server'], vm_args = ['-Xmx256m', '-Dfile.encoding=UTF-8'], ) diff --git a/org.eclipse.jgit.lfs.test/BUCK b/org.eclipse.jgit.lfs.test/BUCK index d0fb96f9cd..1298e166c0 100644 --- a/org.eclipse.jgit.lfs.test/BUCK +++ b/org.eclipse.jgit.lfs.test/BUCK @@ -15,7 +15,6 @@ for t in TESTS: '//lib:hamcrest-library', '//lib:junit', ], - source_under_test = ['//org.eclipse.jgit.lfs:jgit-lfs'], ) java_library( diff --git a/org.eclipse.jgit.pgm.test/BUCK b/org.eclipse.jgit.pgm.test/BUCK index a3859c9b49..cd15510798 100644 --- a/org.eclipse.jgit.pgm.test/BUCK +++ b/org.eclipse.jgit.pgm.test/BUCK @@ -21,7 +21,6 @@ for t in TESTS: '//lib:commons-compress', '//lib:tukaani-xz', ], - source_under_test = ['//org.eclipse.jgit.pgm:pgm'], vm_args = ['-Xmx256m', '-Dfile.encoding=UTF-8'], ) diff --git a/org.eclipse.jgit.test/BUCK b/org.eclipse.jgit.test/BUCK index e4cd47c66d..5b7be89b1e 100644 --- a/org.eclipse.jgit.test/BUCK +++ b/org.eclipse.jgit.test/BUCK @@ -68,7 +68,6 @@ for src in TESTS: '//lib:slf4j-api', '//lib:slf4j-simple', ] + DEPS.get(src, []), - source_under_test = ['//org.eclipse.jgit:jgit'], vm_args = ['-Xmx256m', '-Dfile.encoding=UTF-8'], ) |