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>
This commit is contained in:
parent
fb4abc7f86
commit
e0d1cfb5ad
|
@ -1 +1 @@
|
||||||
e64a2e2ada022f81e42be750b774024469551398
|
7b7817c48f30687781040b2b82ac9218d5c4eaa4
|
||||||
|
|
|
@ -25,7 +25,7 @@ for t in TESTS:
|
||||||
'//lib/jetty:util',
|
'//lib/jetty:util',
|
||||||
'//lib:commons-logging',
|
'//lib:commons-logging',
|
||||||
],
|
],
|
||||||
source_under_test = ['//org.eclipse.jgit.http.server:jgit-servlet'],
|
vm_args = ['-Djava.io.tmpdir=buck-out'],
|
||||||
)
|
)
|
||||||
|
|
||||||
java_library(
|
java_library(
|
||||||
|
|
|
@ -30,6 +30,5 @@ for t in TESTS:
|
||||||
'//lib:servlet-api',
|
'//lib:servlet-api',
|
||||||
'//lib:commons-logging',
|
'//lib:commons-logging',
|
||||||
],
|
],
|
||||||
source_under_test = ['//org.eclipse.jgit.lfs.server:jgit-lfs-server'],
|
|
||||||
vm_args = ['-Xmx256m', '-Dfile.encoding=UTF-8'],
|
vm_args = ['-Xmx256m', '-Dfile.encoding=UTF-8'],
|
||||||
)
|
)
|
||||||
|
|
|
@ -15,7 +15,6 @@ for t in TESTS:
|
||||||
'//lib:hamcrest-library',
|
'//lib:hamcrest-library',
|
||||||
'//lib:junit',
|
'//lib:junit',
|
||||||
],
|
],
|
||||||
source_under_test = ['//org.eclipse.jgit.lfs:jgit-lfs'],
|
|
||||||
)
|
)
|
||||||
|
|
||||||
java_library(
|
java_library(
|
||||||
|
|
|
@ -21,7 +21,6 @@ for t in TESTS:
|
||||||
'//lib:commons-compress',
|
'//lib:commons-compress',
|
||||||
'//lib:tukaani-xz',
|
'//lib:tukaani-xz',
|
||||||
],
|
],
|
||||||
source_under_test = ['//org.eclipse.jgit.pgm:pgm'],
|
|
||||||
vm_args = ['-Xmx256m', '-Dfile.encoding=UTF-8'],
|
vm_args = ['-Xmx256m', '-Dfile.encoding=UTF-8'],
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -68,7 +68,6 @@ for src in TESTS:
|
||||||
'//lib:slf4j-api',
|
'//lib:slf4j-api',
|
||||||
'//lib:slf4j-simple',
|
'//lib:slf4j-simple',
|
||||||
] + DEPS.get(src, []),
|
] + DEPS.get(src, []),
|
||||||
source_under_test = ['//org.eclipse.jgit:jgit'],
|
|
||||||
vm_args = ['-Xmx256m', '-Dfile.encoding=UTF-8'],
|
vm_args = ['-Xmx256m', '-Dfile.encoding=UTF-8'],
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue