Skip to content

Commit 94d43f4

Browse files
Vladimir Kotaltulinkry
authored andcommitted
Bzr test dir (#1570)
move .bzr to bzr fixes #1562 * bazaaaaar * exclude
1 parent 131a499 commit 94d43f4

22 files changed

+16
-2
lines changed

build.xml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@ Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved.
109109
<property name="test.cvs.root" value="${test.cvs}/cvsroot"/>
110110
<property name="test.hg" value="${test.repositories}/mercurial"/>
111111
<property name="test.bk" value="${test.repositories}/bitkeeper"/>
112+
<property name="test.bzr" value="${test.repositories}/bazaar"/>
112113
<property name="test.git" value="${test.repositories}/git"/>
113114
<property name="test.svn" value="${test.repositories}/svn"/>
114115
<property name="test.razor" value="${test.repositories}/razor"/>
@@ -797,13 +798,18 @@ Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved.
797798
<fileset dir="${test.bk}/bk" defaultexcludes="no"/>
798799
</copy>
799800

801+
<!-- Generate ZIP files used for unit testing bzr/.bzr are renamed -->
802+
<copy todir="${test.bzr}/.bzr">
803+
<fileset dir="${test.bzr}/bzr"/>
804+
</copy>
805+
800806
<zip destfile="${build.test.classes.dir}/org/opensolaris/opengrok/index/source.zip"
801807
basedir="${test.sources}"
802808
update="false"
803809
defaultexcludes="no"/>
804810
<zip destfile="${build.test.classes.dir}/org/opensolaris/opengrok/history/repositories.zip"
805811
basedir="${test.repositories}"
806-
excludes="mercurial/hg/**, mercurial/hgignore, git/git/**, bitkeeper/bk/**"
812+
excludes="mercurial/hg/**, mercurial/hgignore, git/git/**, bitkeeper/bk/**, bazaar/bzr/**"
807813
update="false"
808814
defaultexcludes="no"/>
809815

@@ -897,6 +903,7 @@ Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved.
897903
<!-- clean up generated test repositories -->
898904
<target name="-delete-generated-repository-files">
899905
<delete dir="${test.bk}/.bk"/>
906+
<delete dir="${test.bzr}/.bzr"/>
900907
<delete dir="${test.hg}/.hg"/>
901908
<delete file="${test.hg}/.hgignore"/>
902909
<delete dir="${test.git}/.git"/>

opengrok-indexer/build.xml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
3535
<property name="test.cvs.repo" value="${test.cvs}/cvsrepo"/>
3636
<property name="test.cvs.root" value="${test.cvs}/cvsroot"/>
3737
<property name="test.bk" value="${test.repositories}/bitkeeper"/>
38+
<property name="test.bzr" value="${test.repositories}/bazaar"/>
3839
<property name="test.hg" value="${test.repositories}/mercurial"/>
3940
<property name="test.git" value="${test.repositories}/git"/>
4041
<property name="test.svn" value="${test.repositories}/svn"/>
@@ -128,13 +129,18 @@ Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
128129
<fileset dir="${test.bk}/bk" defaultexcludes="no"/>
129130
</copy>
130131

132+
<!-- Generate ZIP files used for unit testing bzr/.bzr are renamed -->
133+
<copy todir="${test.bzr}/.bzr">
134+
<fileset dir="${test.bzr}/bzr"/>
135+
</copy>
136+
131137
<zip destfile="${build.test.classes.dir}/org/opensolaris/opengrok/index/source.zip"
132138
basedir="${test.sources}"
133139
update="false"
134140
defaultexcludes="no"/>
135141
<zip destfile="${build.test.classes.dir}/org/opensolaris/opengrok/history/repositories.zip"
136142
basedir="${test.repositories}"
137-
excludes="mercurial/hg/**, mercurial/hgignore, git/git/**, bitkeeper/bk/**"
143+
excludes="mercurial/hg/**, mercurial/hgignore, git/git/**, bitkeeper/bk/**, bazaar/bzr/**"
138144
update="false"
139145
defaultexcludes="no"/>
140146

@@ -197,6 +203,7 @@ Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
197203
<!-- clean up generated test repositories -->
198204
<target name="-delete-generated-repository-files">
199205
<delete dir="${test.bk}/.bk"/>
206+
<delete dir="${test.bzr}/.bzr"/>
200207
<delete dir="${test.hg}/.hg"/>
201208
<delete file="${test.hg}/.hgignore"/>
202209
<delete dir="${test.git}/.git"/>

0 commit comments

Comments
 (0)