CLI with relative path

pull/5370/head
aniket-engg 4 years ago
parent 32238f27fd
commit ab1d596e7e
  1. 3
      libs/remix-solidity/src/compiler/compiler.ts
  2. 2
      libs/remix-tests/src/compiler.ts
  3. 3
      libs/remix-tests/src/run.ts

@ -130,10 +130,9 @@ export class Compiler {
onCompilationFinished (data: CompilationResult, missingInputs?: string[], source?: SourceWithTarget): void { onCompilationFinished (data: CompilationResult, missingInputs?: string[], source?: SourceWithTarget): void {
let noFatalErrors = true // ie warnings are ok let noFatalErrors = true // ie warnings are ok
const checkIfFatalError = (error: CompilationError) => { const checkIfFatalError = (error: CompilationError) => {
// Ignore warnings and the 'Deferred import' error as those are generated by us as a workaround // Ignore warnings and the 'Deferred import' error as those are generated by us as a workaround
const isValidError = (error.message && error.message=== 'Deferred import') ? false : error.severity !== 'warning' const isValidError = (error.message && error.message.includes('Deferred import')) ? false : error.severity !== 'warning'
if(isValidError) noFatalErrors = false if(isValidError) noFatalErrors = false
} }
if (data.error) checkIfFatalError(data.error) if (data.error) checkIfFatalError(data.error)

@ -129,7 +129,7 @@ export function compileFileOrFiles(filename: string, isDirectory: boolean, opts:
], function (err: Error | null | undefined, result: any) { ], function (err: Error | null | undefined, result: any) {
const error: Error[] = [] const error: Error[] = []
if (result.error) error.push(result.error) if (result.error) error.push(result.error)
const errors = (result.errors || error).filter((e) => e.type === 'Error' || e.severity === 'error') const errors = (result.errors || error).filter((e) => (e.type === 'Error' || e.severity === 'error'))
if (errors.length > 0) { if (errors.length > 0) {
if (!isBrowser) require('signale').fatal(errors) if (!isBrowser) require('signale').fatal(errors)
return cb(new CompilationErrors(errors)) return cb(new CompilationErrors(errors))

@ -1,5 +1,6 @@
import commander from 'commander' import commander from 'commander'
import Web3 from 'web3'; import Web3 from 'web3';
import path from 'path'
import { runTestFiles } from './runTestFiles' import { runTestFiles } from './runTestFiles'
import fs from './fileSystem' import fs from './fileSystem'
import { Provider } from '@remix-project/remix-simulator' import { Provider } from '@remix-project/remix-simulator'
@ -58,7 +59,7 @@ commander
} }
const isDirectory = fs.lstatSync(filename).isDirectory() const isDirectory = fs.lstatSync(filename).isDirectory()
runTestFiles(filename, isDirectory, web3) runTestFiles(path.resolve(filename), isDirectory, web3)
}) })
if (!process.argv.slice(2).length) { if (!process.argv.slice(2).length) {

Loading…
Cancel
Save