Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-16 12:49:55 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'jnotify-multiarch' into 'master'

Browse Source 
Upgrade jnotify to 0.94 to support 64-bit

This upgrades to 0.94 and selects the correct native lib via ${os.arch}. The binaries are from the jnotify sourceforge download page, you can verify them. Also patched up build.xml to display stack trace when exceptions are thrown inside a test.
This commit is contained in:
akwizgran
2014-02-07 13:03:08 +00:00
parent 97585ebc8a 217ff30c54
commit 52b29b16ba
14 changed files with 151 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
briar-tests/src/org/briarproject/plugins/file/UnixRemovableDriveMonitorTest.java
View File

@@ -82,7 +82,8 @@ public class UnixRemovableDriveMonitorTest extends BriarTestCase {
TestUtils.deleteTestDirectory(testDir);
}
private RemovableDriveMonitor createMonitor(final File dir) {
private RemovableDriveMonitor createMonitor(final File dir) throws IOException {
UnixRemovableDriveMonitor.checkEnabled();
return new UnixRemovableDriveMonitor() {
@Override
protected String[] getPathsToWatch() {