aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPartouf <partouf@gmail.com>2020-07-14 20:41:21 +0200
committerPartouf <partouf@gmail.com>2020-07-14 20:41:21 +0200
commitdc2361291ea405a943a55f236ab4926776728e8d (patch)
tree487fcd0ff4a2bfac28665a7f362fb2d734157cd7
parent2b6d3cb0d62bc2976d17013819d3fcb0e5d16661 (diff)
downloadcompiler-explorer-dc2361291ea405a943a55f236ab4926776728e8d.tar.gz
compiler-explorer-dc2361291ea405a943a55f236ab4926776728e8d.zip
bugfix fortran errors
-rw-r--r--lib/compilers/fortran.js5
-rw-r--r--test/utils-tests.js13
2 files changed, 16 insertions, 2 deletions
diff --git a/lib/compilers/fortran.js b/lib/compilers/fortran.js
index d38ee8ebc..6ea062c1e 100644
--- a/lib/compilers/fortran.js
+++ b/lib/compilers/fortran.js
@@ -38,8 +38,9 @@ class FortranCompiler extends BaseCompiler {
const result = await this.exec(compiler, options, execOptions);
result.inputFilename = inputFilename;
- result.stdout = utils.parseOutput(result.stdout, inputFilename);
- result.stderr = utils.parseOutput(result.stderr, inputFilename);
+ const baseFilename = './' + path.basename(inputFilename);
+ result.stdout = utils.parseOutput(result.stdout, baseFilename);
+ result.stderr = utils.parseOutput(result.stderr, baseFilename);
return result;
}
}
diff --git a/test/utils-tests.js b/test/utils-tests.js
index 70d26bcb8..211cbfab0 100644
--- a/test/utils-tests.js
+++ b/test/utils-tests.js
@@ -191,6 +191,19 @@ describe('Tool output', () => {
]);
});
+ it('removes fortran relative path', () => {
+ utils.parseOutput('./example.f90:5:22: error: No explicit type declared for \'y\'', './example.f90').should.deep.equals([
+ {
+ tag: {
+ column: 22,
+ line: 5,
+ text: 'error: No explicit type declared for \'y\''
+ },
+ text: '<source>:5:22: error: No explicit type declared for \'y\''
+ }
+ ]);
+ });
+
it('removes the jailed path', () => {
utils.parseOutput('/home/ubuntu/example.cpp:1:1: Fatal: There were 1 errors compiling module, stopping', './example.cpp').should.deep.equals([
{