mirror of
https://code.briarproject.org/briar/briar.git
synced 2026-02-15 12:19:54 +01:00
upgrade to jnotify 0.94 (patched) for 64-bit support, and improve error reporting in tests
- add a UnixRemovableDriveMonitor.checkEnabled to pre-emptively check if it's loaded - os.arch is always x86,x86_64 on windows, i386,amd64 on linux - source: http://www.java-gaming.org/index.php/topic,14110 - we'll deal with freebsd support when we come to it, jnotify doesn't even do this atm
This commit is contained in:
@@ -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>
|
||||
|
||||
@@ -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() {
|
||||
|
||||
Reference in New Issue
Block a user