Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

Prepare to enable tests on Android #9121

Merged
merged 2 commits into from
Sep 16, 2013
Merged

Prepare to enable tests on Android #9121

merged 2 commits into from
Sep 16, 2013

Conversation

sanxiyn
Copy link
Member

@sanxiyn sanxiyn commented Sep 11, 2013

Ignore failing tests on Android to prepare for #9120.

ifeq ($(OSTYPE_$(1)), linux-androideabi)
$$(LIBUV_MAKEFILE_$(1)_$(2)): $$(LIBUV_DEPS)
(cd $(S)src/libuv/ && \
$$(CFG_PYTHON) ./gyp_uv -f make -Dtarget_arch=$$(LIBUV_ARCH_$(1)) -D ninja -DOS=android \
Copy link
Member

Choose a reason for hiding this comment

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

Is there already a makefile variable for OS=android somewhere? I'd love to reduce the amount of duplication among platforms (that's what gyp is supposed to take care of)

Copy link
Member Author

Choose a reason for hiding this comment

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

I don't know. Also I am not sure whether that will help, since Rust and libuv may have different ideas about what the name of an OS should be.

Copy link
Member

Choose a reason for hiding this comment

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

Hmm that does appear to be the case, that's unfortunate, but could this be a separate define?

Something like

ifeq ($(OSTYPE_$(1)), linux-androideabi)
LIBUV_OS_$(1) = -DOS=android
else
LIBUV_OS_$(1) =
endif

and then you use LIBUV_OS_$(1) in the same rule.

@sanxiyn
Copy link
Member Author

sanxiyn commented Sep 16, 2013

Re-purposed LIBUV_OSTYPE (which was unused) to pass OS to gyp_uv. Also un-xfail a test since #9117 is fixed.

@alexcrichton
Copy link
Member

You mentioned that you un-xfail'd a test, but there doesn't appear to be any tests that were un-xfail'd? Looks like one was xfail'd, though...

@sanxiyn
Copy link
Member Author

sanxiyn commented Sep 16, 2013

Before the last update, two tests were xfailed, now only one test is xfailed. (Un-xfailed one is capture_nil.)

bors added a commit that referenced this pull request Sep 16, 2013
Ignore failing tests on Android to prepare for #9120.
@bors bors closed this Sep 16, 2013
@bors bors merged commit 942bc31 into rust-lang:master Sep 16, 2013
flip1995 pushed a commit to flip1995/rust that referenced this pull request Jul 18, 2022
…, r=flip1995

Fix stderr for cast_size_32bit

changelog: fix stderr for cast_size_32bit
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.

3 participants