Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Fix emscripten test detection #40259

Merged
merged 1 commit into from
Mar 11, 2017
Merged

Conversation

TimNN
Copy link
Contributor

@TimNN TimNN commented Mar 4, 2017

Without this change rustbuild will attempt to run .js.map files (if they exist) resulting in lots of sadness.

r? @alexcrichton

@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Contributor

bors commented Mar 6, 2017

📌 Commit c1c045d has been approved by alexcrichton

@alexcrichton
Copy link
Member

@TimNN out of curiosity, how come we don't run into this today? Or is this part of the LLVM 4.0 upgrade?

@TimNN
Copy link
Contributor Author

TimNN commented Mar 6, 2017

@alexcrichton: I honestly don't really know. While I did encounter this working on the LLVM 4.0 upgrade, I also had a few successful builds without this being a problem. I think I encountered this after compiling llvm / rustc with some additional debugging options, although this may have also been caused by me running / adapting some failed commands.

@alexcrichton
Copy link
Member

Oh well, seems ok regardless :)

@bors
Copy link
Contributor

bors commented Mar 9, 2017

🔒 Merge conflict

@TimNN TimNN force-pushed the fix-emscripten-tests branch from c1c045d to 4eeede3 Compare March 9, 2017 10:44
@TimNN
Copy link
Contributor Author

TimNN commented Mar 9, 2017

Rebased.

@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Contributor

bors commented Mar 9, 2017

📌 Commit 4eeede3 has been approved by alexcrichton

frewsxcv added a commit to frewsxcv/rust that referenced this pull request Mar 9, 2017
…richton

Fix emscripten test detection

Without this change `rustbuild` will attempt to run `.js.map` files (if they exist) resulting in lots of sadness.

r? @alexcrichton
frewsxcv added a commit to frewsxcv/rust that referenced this pull request Mar 9, 2017
…richton

Fix emscripten test detection

Without this change `rustbuild` will attempt to run `.js.map` files (if they exist) resulting in lots of sadness.

r? @alexcrichton
alexcrichton added a commit to alexcrichton/rust that referenced this pull request Mar 10, 2017
…richton

Fix emscripten test detection

Without this change `rustbuild` will attempt to run `.js.map` files (if they exist) resulting in lots of sadness.

r? @alexcrichton
alexcrichton added a commit to alexcrichton/rust that referenced this pull request Mar 10, 2017
…richton

Fix emscripten test detection

Without this change `rustbuild` will attempt to run `.js.map` files (if they exist) resulting in lots of sadness.

r? @alexcrichton
arielb1 pushed a commit to arielb1/rust that referenced this pull request Mar 10, 2017
…richton

Fix emscripten test detection

Without this change `rustbuild` will attempt to run `.js.map` files (if they exist) resulting in lots of sadness.

r? @alexcrichton
arielb1 pushed a commit to arielb1/rust that referenced this pull request Mar 10, 2017
…richton

Fix emscripten test detection

Without this change `rustbuild` will attempt to run `.js.map` files (if they exist) resulting in lots of sadness.

r? @alexcrichton
arielb1 pushed a commit to arielb1/rust that referenced this pull request Mar 10, 2017
…richton

Fix emscripten test detection

Without this change `rustbuild` will attempt to run `.js.map` files (if they exist) resulting in lots of sadness.

r? @alexcrichton
alexcrichton added a commit to alexcrichton/rust that referenced this pull request Mar 11, 2017
…richton

Fix emscripten test detection

Without this change `rustbuild` will attempt to run `.js.map` files (if they exist) resulting in lots of sadness.

r? @alexcrichton
@bors bors merged commit 4eeede3 into rust-lang:master Mar 11, 2017
@TimNN TimNN deleted the fix-emscripten-tests branch April 7, 2017 20:14
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants