Skip to content

Improve testing on Windows#3142

Merged
aardappel merged 1 commit into
WebAssembly:masterfrom
aardappel:windows
Sep 17, 2020
Merged

Improve testing on Windows#3142
aardappel merged 1 commit into
WebAssembly:masterfrom
aardappel:windows

Conversation

@aardappel

Copy link
Copy Markdown
Contributor

This PR contains:

  • Changes that enable/disable tests on Windows to allow for better local testing.
  • Also changes many abort() into exit(1) when it is really just exiting on error. This is because abort() generates a dialog window on Windows which is not great in automated scripts.
  • Improvements to CMake to better work with the project in IDEs (VS).

@kripken kripken left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for splitting this out!

lgtm aside from the comments.

Comment thread CMakeLists.txt Outdated

# Sources.

FILE(GLOB binaryen_HEADERS src/*.h)

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we prefer file (lowercase) for these things.

Also, a newline? (but I'm not familiar enough with cmake, is there a reason not to?)

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

a newline where?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(I meant after this line and before the next one, but no big deal.)

Comment thread src/passes/ExtractFunction.cpp Outdated
Comment thread src/passes/pass.cpp
Comment thread src/passes/pass.cpp Outdated
Comment thread src/tools/wasm-shell.cpp Outdated
Comment thread src/wasm2js.h Outdated
return Prologue.getFileNameByIndex(FileIndex, CompDir, Kind, Result,
// FIXME: this fixes paths being incorrect when generated on
// Windows, but needs to be upstreamed how?
llvm::sys::path::Style::posix);

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need this? I thought the test was disabled earlier.

We considered doing this in the past, but were worried that it may change observable behavior for emscripten users with DWARF. If we change this we may need to make a corresponding change on the emscripten side, I'm not sure, but hopefully we can avoid both.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This would allow us to enable those tests on Windows. I will remove it for now, since at least we now know exactly where that \ gets introduced..

This PR contains:
- Changes that enable/disable tests on Windows to allow for better local testing.
- Also changes many abort() into Fatal() when it is really just exiting on error. This is because abort() generates a dialog window on Windows which is not great in automated scripts.
- Improvements to CMake to better work with the project in IDEs (VS).
@aardappel aardappel merged commit 6116553 into WebAssembly:master Sep 17, 2020
@aardappel aardappel deleted the windows branch September 17, 2020 18:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants