blob: 15a87e2681f605dd66973b08bd257f70e26b7748 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
|
--- a/apps/i2ptunnel/java/build.xml
+++ b/apps/i2ptunnel/java/build.xml
@@ -465,7 +465,7 @@
<target name="test" depends="clean, compileTest">
<junit printsummary="on" fork="yes">
<classpath>
- <pathelement path="${classpath}" />
+ <pathelement path="${gentoo.classpath}" />
<pathelement location="./build/obj" />
<pathelement location="../../../core/java/build/i2p.jar" />
</classpath>
--- a/apps/ministreaming/java/build.xml
+++ b/apps/ministreaming/java/build.xml
@@ -310,22 +310,12 @@
<junit printsummary="withOutAndErr" fork="yes" showoutput="yes" >
<sysproperty key="net.sourceforge.cobertura.datafile" file="./cobertura.ser" />
<classpath>
- <pathelement path="${javac.classpath}" />
- <pathelement location="${hamcrest.home}/hamcrest-core.jar" />
- <pathelement location="${hamcrest.home}/hamcrest-library.jar" />
- <pathelement location="${hamcrest.home}/hamcrest-integration.jar" />
- <pathelement location="${hamcrest.home}/hamcrest-all.jar" />
- <pathelement location="${mockito.home}/byte-buddy.jar" />
- <pathelement location="${mockito.home}/objenesis.jar" />
- <pathelement location="${mockito.home}/mockito-core.jar" />
- <pathelement location="${junit.home}/junit4.jar" />
+ <pathelement path="${gentoo.classpath}" />
<pathelement location="./build/obj_cobertura" />
<pathelement location="./build/obj" />
<pathelement location="../../../core/java/build/i2ptest.jar" />
<pathelement location="../../../core/java/build/i2p.jar" />
<pathelement location="../../build/jbigi.jar" />
- <pathelement location="${with.clover}" />
- <pathelement location="${with.cobertura}" />
</classpath>
<batchtest todir="../../../reports/ministreaming/junit/">
<fileset dir="./test/junit">
--- a/apps/streaming/java/build.xml
+++ b/apps/streaming/java/build.xml
@@ -126,23 +126,13 @@
<junit printsummary="withOutAndErr" fork="yes" showoutput="yes" >
<sysproperty key="net.sourceforge.cobertura.datafile" file="./cobertura.ser" />
<classpath>
- <pathelement path="${javac.classpath}" />
- <pathelement location="${hamcrest.home}/hamcrest-core.jar" />
- <pathelement location="${hamcrest.home}/hamcrest-library.jar" />
- <pathelement location="${hamcrest.home}/hamcrest-integration.jar" />
- <pathelement location="${hamcrest.home}/hamcrest-all.jar" />
- <pathelement location="${mockito.home}/byte-buddy.jar" />
- <pathelement location="${mockito.home}/objenesis.jar" />
- <pathelement location="${mockito.home}/mockito-core.jar" />
- <pathelement location="${junit.home}/junit4.jar" />
+ <pathelement path="${gentoo.classpath}" />
<pathelement location="./build/obj_cobertura" />
<pathelement location="./build/obj" />
<pathelement location="../../../core/java/build/i2ptest.jar" />
<pathelement location="../../../core/java/build/i2p.jar" />
<pathelement location="../../ministreaming/java/build/mstreaming.jar" />
<pathelement location="../../build/jbigi.jar" />
- <pathelement location="${with.clover}" />
- <pathelement location="${with.cobertura}" />
</classpath>
<batchtest todir="../../../reports/streaming/junit/">
<fileset dir="./test/junit">
--- a/core/java/build.xml
+++ b/core/java/build.xml
@@ -469,22 +469,12 @@
<junit printsummary="withOutAndErr" fork="yes" maxmemory="384m" showoutput="yes" >
<sysproperty key="net.sourceforge.cobertura.datafile" file="./cobertura.ser" />
<classpath>
+ <pathelement path="${gentoo.classpath}" />
<pathelement location="../../installer/resources/" />
- <pathelement path="${javac.classpath.mod}" />
- <pathelement location="${hamcrest.home}/hamcrest-core.jar" />
- <pathelement location="${hamcrest.home}/hamcrest-library.jar" />
- <pathelement location="${hamcrest.home}/hamcrest-integration.jar" />
- <pathelement location="${hamcrest.home}/hamcrest-all.jar" />
- <pathelement location="${mockito.home}/byte-buddy.jar" />
- <pathelement location="${mockito.home}/objenesis.jar" />
- <pathelement location="${mockito.home}/mockito-core.jar" />
- <pathelement location="${junit.home}/junit4.jar" />
<pathelement location="./build/obj_cobertura" />
<pathelement location="./build/obj" />
<pathelement location="./test/resources" />
<pathelement location="../../build/jbigi.jar" />
- <pathelement location="${with.clover}" />
- <pathelement location="${with.cobertura}" />
</classpath>
<batchtest todir="../../reports/core/junit/">
<fileset dir="./test/junit/">
--- a/router/java/build.xml
+++ b/router/java/build.xml
@@ -419,18 +419,11 @@
<junit printsummary="withOutAndErr" fork="yes" showoutput="yes" >
<sysproperty key="net.sourceforge.cobertura.datafile" file="./cobertura.ser" />
<classpath>
- <pathelement path="${javac.classpath}" />
- <pathelement location="${hamcrest.home}/hamcrest-core.jar" />
- <pathelement location="${hamcrest.home}/hamcrest-library.jar" />
- <pathelement location="${hamcrest.home}/hamcrest-integration.jar" />
- <pathelement location="${hamcrest.home}/hamcrest-all.jar" />
- <pathelement location="${junit.home}/junit4.jar" />
+ <pathelement path="${gentoo.classpath}" />
<pathelement location="./build/obj_cobertura" />
<pathelement location="./build/obj" />
<pathelement location="../../core/java/build/i2ptest.jar" />
<pathelement location="../../build/jbigi.jar" />
- <pathelement location="${with.clover}" />
- <pathelement location="${with.cobertura}" />
</classpath>
<batchtest todir="../../reports/router/junit/">
<fileset dir="./test/junit">
|
GitWeb