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

Merge pull request #1727 from xied75/issue-1725 

fix #1725; get dotnet target test run
This commit is contained in:
Terence Parr 2017-03-03 18:23:42 -08:00 committed by GitHub
parent 4a5e65c5e7 e49b0977f5
commit d8826368d4
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis/before-install-linux-dotnet.sh
View File

@ -19,6 +19,4 @@ sudo rm -rf /usr/local/maven/ && sudo mkdir -p /usr/local/maven && \
sudo tar xzvf apache-maven-3.3.9-bin.tar.gz -C /usr/local/maven --strip-components=1
mvn -v
whereis mono
which mono
mono --version

2
.travis/run-tests-dotnet.sh
View File

@ -1,4 +1,4 @@
#!/bin/bash
mvn -q -Dparallel=methods -DthreadCount=4 -Dtest=csharp.* -DargLine="-Dantlr-csharp-netstandard=true" test
mvn -q -Dparallel=methods -DthreadCount=4 -Dtest=csharp.* -Dantlr-csharp-netstandard=true test

12
runtime-testsuite/test/org/antlr/v4/test/runtime/csharp/BaseCSharpTest.java
View File

@ -726,8 +726,10 @@ public class BaseCSharpTest implements RuntimeTestSupport /*, SpecialRuntimeTest
"public class Test {\n" +
" public static void Main(string[] args) {\n" +
" string inputData = File.ReadAllText(args[0], Encoding.UTF8);\n" +
" using (TextWriter output = new StreamWriter(args[1]),\n" +
" errorOutput = new StreamWriter(args[2])) {\n" +
" using (FileStream fsOut = new FileStream(args[1], FileMode.Create, FileAccess.Write))\n" +
" using (FileStream fsErr = new FileStream(args[2], FileMode.Create, FileAccess.Write))\n" +
" using (TextWriter output = new StreamWriter(fsOut),\n" +
" errorOutput = new StreamWriter(fsErr)) {\n" +
" CodePointCharStream input = new CodePointCharStream(inputData);\n" +
" input.name = args[0];\n" +
" <lexerName> lex = new <lexerName>(input, output, errorOutput);\n" +
@ -780,8 +782,10 @@ public class BaseCSharpTest implements RuntimeTestSupport /*, SpecialRuntimeTest
" public static void Main(string[] args) {\n" +
" string inputData = File.ReadAllText(args[0], Encoding.UTF8);\n" +
" ICharStream input = new CodePointCharStream(inputData);\n" +
" using (TextWriter output = new StreamWriter(args[1]),\n" +
" errorOutput = new StreamWriter(args[2])) {\n" +
" using (FileStream fsOut = new FileStream(args[1], FileMode.Create, FileAccess.Write))\n" +
" using (FileStream fsErr = new FileStream(args[2], FileMode.Create, FileAccess.Write))\n" +
" using (TextWriter output = new StreamWriter(fsOut),\n" +
" errorOutput = new StreamWriter(fsErr)) {\n" +
" <lexerName> lex = new <lexerName>(input, output, errorOutput);\n" +
" CommonTokenStream tokens = new CommonTokenStream(lex);\n" +
" tokens.Fill();\n" +

3
runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Tree/Xpath/XPathLexer.cs
View File

@ -17,9 +17,6 @@
// Ambiguous reference in cref attribute
#pragma warning disable 419
using System;
using System;
using System.Text;
using Antlr4.Runtime;

1
runtime/CSharp/runtime/CSharp/project.json
View File

@ -14,6 +14,7 @@
"keyFile": "../Antlr4.snk",
"define": [
"DOTNETCORE",
"NET35PLUS",
"NET40PLUS",
"NET45PLUS"
],