forgetest1
/
antlr
forked from jasder/antlr
1
0
Fork 0
Code Issues Pull Requests 1 Releases Wiki Activity

reset resource locations to entire runtime dir.

This commit is contained in:
parrt 2015-06-25 12:14:30 -07:00
parent 80b011adef
commit ef870a4703
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
antlr4.iml
View File

@ -18,11 +18,7 @@
<sourceFolder url="file://$MODULE_DIR$/tool/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/tool/target/generated-sources/antlr3" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/tool-testsuite/test" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/runtime/CSharp" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/runtime/Python3" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/runtime/Python2" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/runtime/JavaScript" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/runtime/Java" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/runtime" type="java-resource" />
<excludeFolder url="file://$MODULE_DIR$/runtime-testsuite/test/org/antlr/v4/test/runtime/javascript" />
<excludeFolder url="file://$MODULE_DIR$/runtime-testsuite/test/org/antlr/v4/test/runtime/python2" />
</content>

2
runtime-testsuite/test/org/antlr/v4/test/runtime/csharp/BaseTest.java
View File

@ -470,7 +470,7 @@ public abstract class BaseTest {
// update runtime project reference
// find project file as a resource not relative pathname (now that we've merged repos)
String runtimeName = isWindows() ? "Antlr4.Runtime.vs2013.csproj" : "Antlr4.Runtime.mono.csproj";
final URL runtimeProj = loader.getResource("runtime/CSharp/Antlr4.Runtime/"+runtimeName);
final URL runtimeProj = loader.getResource("CSharp/runtime/CSharp/Antlr4.Runtime/"+runtimeName);
if ( runtimeProj==null ) {
throw new RuntimeException("C# runtime project file not found at:" + runtimeProj.getPath());
}