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
|
From: Jakub Adam <jakub.adam@ktknet.cz>
Date: Fri, 6 Jul 2012 12:51:04 +0200
Subject: disable-cmdline-wrapper
Seems upstream stopped maintaining commandline SVN client wrapper and it
now became uncompilable as a result.
---
build.xml | 15 +++++++++------
.../subversion/svnclientadapter/testUtils/SVNTest.java | 8 ++++----
2 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/build.xml b/build.xml
index 8eac813..c04e1fa 100644
--- a/build.xml
+++ b/build.xml
@@ -35,9 +35,9 @@
<depend srcDir="${src.svnkit.dir}"
destDir="${build.classes.dir}"
cache="${build.cache.dir}"/>
- <depend srcDir="${src.cmdline.dir}"
+ <!--depend srcDir="${src.cmdline.dir}"
destDir="${build.classes.dir}"
- cache="${build.cache.dir}"/>
+ cache="${build.cache.dir}"/-->
<javac srcdir="${src.main.dir}"
destdir="${build.classes.dir}"
debug="${debug}"
@@ -65,7 +65,7 @@
classpathref="project.classpath"
encoding="ISO-8859-1">
</javac>
- <javac srcdir="${src.cmdline.dir}"
+ <!--javac srcdir="${src.cmdline.dir}"
destdir="${build.classes.dir}"
debug="${debug}"
source="${targetJvm}"
@@ -73,7 +73,7 @@
includes="**"
classpathref="project.classpath"
encoding="ISO-8859-1">
- </javac>
+ </javac-->
<copy todir="${build.classes.dir}">
<fileset dir="${src.main.dir}">
<exclude name="**/*.java"/>
@@ -169,7 +169,7 @@
<formatter type="brief" usefile="false"/>
<test name="org.tigris.subversion.svnclientadapter.basictests.SVNJavahlTests" fork="yes"/>
<test name="org.tigris.subversion.svnclientadapter.basictests.SVNSvnKitTests" fork="yes"/>
- <test name="org.tigris.subversion.svnclientadapter.basictests.SVNCmdLineTests" fork="yes"/>
+ <!--test name="org.tigris.subversion.svnclientadapter.basictests.SVNCmdLineTests" fork="yes"/-->
</junit>
<echo message="Running misc tests ..." level="info"/>
<junit printsummary="yes" haltonfailure="false" failureproperty="testFailed" fork="yes">
@@ -211,12 +211,15 @@
<javac srcdir="${src.tests.dir}"
destdir="${build.testClasses.dir}"
debug="${debug}"
- includes="**"
+ sourcepath=""
encoding="ISO-8859-1">
<classpath>
<pathelement location="${build.classes.dir}"/>
<path refid="project.classpath"/>
</classpath>
+ <include name="**"/>
+ <exclude name="org/tigris/subversion/svnclientadapter/commandline/**"/>
+ <exclude name="org/tigris/subversion/svnclientadapter/regression/CmdLineBugRegressionTest.java"/>
</javac>
<!-- run the EMMA instrumentation -->
<delete dir="${emma.instrClasses.dir}"/>
diff --git a/src/testcases/org/tigris/subversion/svnclientadapter/testUtils/SVNTest.java b/src/testcases/org/tigris/subversion/svnclientadapter/testUtils/SVNTest.java
index 0b3579a..6b19e39 100644
--- a/src/testcases/org/tigris/subversion/svnclientadapter/testUtils/SVNTest.java
+++ b/src/testcases/org/tigris/subversion/svnclientadapter/testUtils/SVNTest.java
@@ -27,7 +27,7 @@ import junit.framework.TestCase;
import org.tigris.subversion.svnclientadapter.ISVNClientAdapter;
import org.tigris.subversion.svnclientadapter.SVNClientAdapterFactory;
import org.tigris.subversion.svnclientadapter.SVNClientException;
-import org.tigris.subversion.svnclientadapter.commandline.CmdLineClientAdapterFactory;
+//import org.tigris.subversion.svnclientadapter.commandline.CmdLineClientAdapterFactory;
import org.tigris.subversion.svnclientadapter.javahl.JhlClientAdapterFactory;
import org.tigris.subversion.svnclientadapter.svnkit.SvnKitClientAdapterFactory;
@@ -77,11 +77,11 @@ public abstract class SVNTest extends TestCase {
} catch (SVNClientException e) {
// can't register this factory
}
- try {
+ /*try {
CmdLineClientAdapterFactory.setup();
} catch (SVNClientException e1) {
// can't register this factory
- }
+ }*/
try {
SvnKitClientAdapterFactory.setup();
} catch (SVNClientException e1) {
@@ -223,4 +223,4 @@ public abstract class SVNTest extends TestCase {
super.tearDown();
}
-}
\ No newline at end of file
+}
|
