Skip to content

Commit

Permalink
go, test browser: Move MSYS2 POSIX path setting
Browse files Browse the repository at this point in the history
Turns out setting `MSYS_NO_PATHCONV='true'` and
`MSYS2_ARG_CONV_EXCL='*'` at the top level was a bad idea, as it breaks
`npm install`. So mbland/go-script-bash#176 should be closed.
  • Loading branch information
mbland committed May 29, 2017
1 parent ad2edf9 commit 14498da
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 7 deletions.
7 changes: 0 additions & 7 deletions go
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,6 @@ fi

export PATH="node_modules/.bin:$PATH"

# Keep this until the following is resolved:
# https://github.com/mbland/go-script-bash/issues/176
if [[ "$OSTYPE" == 'msys' ]]; then
export MSYS_NO_PATHCONV='true'
export MSYS2_ARG_CONV_EXCL='*'
fi

if [[ -t 1 || -n "$TRAVIS" ]]; then
_GO_LOG_FORMATTING='true'
fi
Expand Down
6 changes: 6 additions & 0 deletions scripts/test.d/browser
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,12 @@ _test_browser_run_tests() {
if ! _test_browser_create_bundle; then
return 1
fi

if [[ "$OSTYPE" == 'msys' ]]; then
export MSYS_NO_PATHCONV='true'
export MSYS2_ARG_CONV_EXCL='*'
fi

if [[ "$__single_run" == 'true' ]]; then
_test_browser_run_in_phantomjs
else
Expand Down

0 comments on commit 14498da

Please sign in to comment.