Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-19 06:09: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

2
briar-tests/.classpath
View File

@@ -5,7 +5,7 @@
<classpathentry combineaccessrules="false" kind="src" path="/briar-core"/>
<classpathentry combineaccessrules="false" kind="src" path="/briar-desktop"/>
<classpathentry kind="lib" path="/briar-api/libs/guice-3.0-no_aop.jar"/>
<classpathentry kind="lib" path="/briar-desktop/libs/jnotify-0.93.jar"/>
<classpathentry kind="lib" path="/briar-desktop/libs/jnotify-0.94.jar"/>
<classpathentry kind="lib" path="/briar-desktop/libs/jssc-0.9-briar.jar" sourcepath="/briar-desktop/libs/source/jssc-0.9-briar-source.jar"/>
<classpathentry kind="lib" path="libs/hamcrest-core-1.1.jar"/>
<classpathentry kind="lib" path="libs/hamcrest-library-1.1.jar"/>

7
briar-tests/build.xml
View File

@@ -76,10 +76,11 @@
</javac>
</target>
<target name='test' depends='compile'>
<junit printsummary='on' fork='yes' forkmode='once'>
<junit printsummary='on' fork='yes' forkmode='once' haltonfailure='yes' showoutput='true'>
<assertions>
<enable/>
</assertions>
<formatter type="plain" usefile="false"/>
<classpath>
<fileset refid='test-jars'/>
<fileset refid='desktop-jars'/>
@@ -90,7 +91,7 @@
<path refid='core-classes'/>
<path refid='api-classes'/>
</classpath>
<jvmarg value='-Djava.library.path=../briar-desktop/libs'/>
<sysproperty key='java.library.path' value='../briar-desktop/libs'/>
<test name='org.briarproject.LockFairnessTest'/>
<test name='org.briarproject.ProtocolIntegrationTest'/>
<test name='org.briarproject.crypto.FortunaGeneratorTest'/>
@@ -153,7 +154,7 @@
<path refid='core-classes'/>
<path refid='api-classes'/>
</classpath>
<jvmarg value='-Djava.library.path=../briar-desktop/libs'/>
<sysproperty key='java.library.path' value='../briar-desktop/libs'/>
<test name='org.briarproject.db.H2DatabaseTest'/>
</junit>
</target>

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() {