Skip to content

Commit 3f89f5f

Browse files
committed
use ctags binary from RuntimeEnvironment in IndexerRepoTest.java
1 parent 3f6755e commit 3f89f5f

File tree

1 file changed

+2
-12
lines changed

1 file changed

+2
-12
lines changed

test/org/opensolaris/opengrok/index/IndexerRepoTest.java

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -46,16 +46,6 @@ public class IndexerRepoTest {
4646
TestRepository repository;
4747
private final String ctagsProperty = "org.opensolaris.opengrok.analysis.Ctags";
4848

49-
@BeforeClass
50-
public static void setUpClass() throws Exception {
51-
assertTrue("No point in running indexer tests without valid ctags",
52-
RuntimeEnvironment.getInstance().validateExuberantCtags());
53-
}
54-
55-
@AfterClass
56-
public static void tearDownClass() throws Exception {
57-
}
58-
5949
@Before
6050
public void setUp() throws IOException {
6151
repository = new TestRepository();
@@ -93,7 +83,7 @@ public void testMainWithH() throws IOException {
9383
env.setCtags(System.getProperty(ctagsProperty, "ctags"));
9484
if (env.validateExuberantCtags()) {
9585
String[] argv = {"-S", "-H", "-s", repository.getSourceRoot(),
96-
"-d", repository.getDataRoot(), "-v"};
86+
"-d", repository.getDataRoot(), "-v", "-c", env.getCtags()};
9787
Indexer.main(argv);
9888
checkNumberOfThreads();
9989
} else {
@@ -108,7 +98,7 @@ public void testMainWithoutH() throws IOException {
10898
env.setCtags(System.getProperty(ctagsProperty, "ctags"));
10999
if (env.validateExuberantCtags()) {
110100
String[] argv = {"-S", "-P", "-s", repository.getSourceRoot(),
111-
"-d", repository.getDataRoot(), "-v"};
101+
"-d", repository.getDataRoot(), "-v", "-c", env.getCtags()};
112102
Indexer.main(argv);
113103
checkNumberOfThreads();
114104
} else {

0 commit comments

Comments
 (0)