|
@@ -151,6 +151,9 @@ class Main {
|
|
.filter(s -> 0 != s.indexOf('Picked up JAVA_TOOL_OPTIONS:'))
|
|
.filter(s -> 0 != s.indexOf('Picked up JAVA_TOOL_OPTIONS:'))
|
|
.join('\n');
|
|
.join('\n');
|
|
|
|
|
|
|
|
+ content = hideStdPositions(content);
|
|
|
|
+ expected = hideStdPositions(expected);
|
|
|
|
+
|
|
if (StringTools.startsWith(content, '{"jsonrpc":')) {
|
|
if (StringTools.startsWith(content, '{"jsonrpc":')) {
|
|
try {
|
|
try {
|
|
content = haxe.Json.stringify(haxe.Json.parse(content).result.result);
|
|
content = haxe.Json.stringify(haxe.Json.parse(content).result.result);
|
|
@@ -178,6 +181,15 @@ class Main {
|
|
return true;
|
|
return true;
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ static function hideStdPositions(content:String):String {
|
|
|
|
+ var std = Path.removeTrailingSlashes(getStd());
|
|
|
|
+ var regex = new EReg(std + '([a-z/]+\\.hx):[0-9]+:( characters? [0-9]+(-[0-9]+)( :)?)', 'i');
|
|
|
|
+
|
|
|
|
+ return content.split("\n")
|
|
|
|
+ .map(line -> regex.replace(line, "$1:???:"))
|
|
|
|
+ .join("\n");
|
|
|
|
+ }
|
|
|
|
+
|
|
static macro function getStd() {
|
|
static macro function getStd() {
|
|
var std = Compiler.getConfiguration().stdPath;
|
|
var std = Compiler.getConfiguration().stdPath;
|
|
return macro $v{std.shift()};
|
|
return macro $v{std.shift()};
|