Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
B
baas-ide
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
JIRA
JIRA
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
guxukai
baas-ide
Commits
d557eb54
Commit
d557eb54
authored
Nov 19, 2018
by
0mkar
Committed by
yann300
Jan 02, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
use filepath again
parent
b0e72d55
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
compiler.js
remix-tests/src/compiler.js
+3
-3
No files found.
remix-tests/src/compiler.js
View file @
d557eb54
...
@@ -26,13 +26,14 @@ var isBrowser = !(typeof (window) === 'undefined' || userAgent.indexOf(' electro
...
@@ -26,13 +26,14 @@ var isBrowser = !(typeof (window) === 'undefined' || userAgent.indexOf(' electro
// TODO: replace this with remix's own compiler code
// TODO: replace this with remix's own compiler code
function
compileFileOrFiles
(
filename
,
isDirectory
,
opts
,
cb
)
{
function
compileFileOrFiles
(
filename
,
isDirectory
,
opts
,
cb
)
{
let
compiler
,
filepath
let
compiler
let
accounts
=
opts
.
accounts
||
[]
let
accounts
=
opts
.
accounts
||
[]
const
sources
=
{
const
sources
=
{
'tests.sol'
:
{
content
:
require
(
'../sol/tests.sol.js'
)
},
'tests.sol'
:
{
content
:
require
(
'../sol/tests.sol.js'
)
},
'remix_tests.sol'
:
{
content
:
require
(
'../sol/tests.sol.js'
)
},
'remix_tests.sol'
:
{
content
:
require
(
'../sol/tests.sol.js'
)
},
'remix_accounts.sol'
:
{
content
:
writeTestAccountsContract
(
accounts
)
}
'remix_accounts.sol'
:
{
content
:
writeTestAccountsContract
(
accounts
)
}
}
}
const
filepath
=
(
isDirectory
?
filename
:
path
.
dirname
(
filename
))
// TODO: for now assumes filepath dir contains all tests, later all this
// TODO: for now assumes filepath dir contains all tests, later all this
// should be replaced with remix's & browser solidity compiler code
// should be replaced with remix's & browser solidity compiler code
...
@@ -40,7 +41,6 @@ function compileFileOrFiles (filename, isDirectory, opts, cb) {
...
@@ -40,7 +41,6 @@ function compileFileOrFiles (filename, isDirectory, opts, cb) {
// We should only look into current file if a full file name with path is given
// We should only look into current file if a full file name with path is given
// We should only walk through directory if a directory name is passed
// We should only walk through directory if a directory name is passed
try
{
try
{
filepath
=
(
isDirectory
?
filename
:
path
.
dirname
(
filename
))
// walkSync only if it is a directory
// walkSync only if it is a directory
fs
.
walkSync
(
filepath
,
foundpath
=>
{
fs
.
walkSync
(
filepath
,
foundpath
=>
{
// only process .sol files
// only process .sol files
...
@@ -68,7 +68,7 @@ function compileFileOrFiles (filename, isDirectory, opts, cb) {
...
@@ -68,7 +68,7 @@ function compileFileOrFiles (filename, isDirectory, opts, cb) {
compiler
.
event
.
register
(
'compilationFinished'
,
this
,
function
(
success
,
data
,
source
)
{
compiler
.
event
.
register
(
'compilationFinished'
,
this
,
function
(
success
,
data
,
source
)
{
next
(
null
,
data
)
next
(
null
,
data
)
})
})
compiler
.
compile
(
sources
,
f
alse
)
compiler
.
compile
(
sources
,
f
ilepath
)
}
}
],
function
(
err
,
result
)
{
],
function
(
err
,
result
)
{
let
errors
=
(
result
.
errors
||
[]).
filter
((
e
)
=>
e
.
type
===
'Error'
||
e
.
severity
===
'error'
)
let
errors
=
(
result
.
errors
||
[]).
filter
((
e
)
=>
e
.
type
===
'Error'
||
e
.
severity
===
'error'
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment