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

Enable test for android #21774

Merged
merged 9 commits into from
Feb 17, 2015
Merged

Conversation

ejjeong
Copy link
Contributor

@ejjeong ejjeong commented Jan 30, 2015

@rust-highfive
Copy link
Collaborator

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @alexcrichton (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. The way Github handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see CONTRIBUTING.md for more information.

$(foreach target,$(CFG_TARGET), \
$(if $(findstring $(CFG_ADB_DEVICE_STATUS),"true"), \
$(eval $(call INSTALL_RUNTIME_TARGET_N,$(taget),$(CFG_BUILD))) \
$(eval $(call INSTALL_RUNTIME_TARGET_CLEANUP_N,arm-linux-$(target))) \
Copy link
Member

Choose a reason for hiding this comment

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

Should this just be $(target) instead of arm-linux-$(target)? (to keep in line with the previous definition)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I've changed this. Thank you for finding this.

@alexcrichton
Copy link
Member

Looks good to me! (needs a rebase though)

@ejjeong
Copy link
Contributor Author

ejjeong commented Feb 4, 2015

r? @alexcrichton

@alexcrichton
Copy link
Member

@bors: r+ 49a520c

bors added a commit that referenced this pull request Feb 4, 2015
- Now "make check-stage2-T-aarch64-linux-android-H-x86_64-unknown-linux-gnu" works (#21773)
- Fix & enable debuginfo tests for android (#10381)
- Fix & enable more tests for android (both for arm/aarch64)
- Enable many already-pass tests on android (both for arm/aarch64)
@bors
Copy link
Contributor

bors commented Feb 4, 2015

⌛ Testing commit 49a520c with merge 9fd1a97...

@bors
Copy link
Contributor

bors commented Feb 4, 2015

💔 Test failed - auto-linux-64-x-android-t

$(shell $(CFG_ADB) shell mkdir $(CFG_ADB_TEST_DIR)/$(target)) \
$(foreach crate,$(TARGET_CRATES), \
$(shell $(CFG_ADB) push $(TLIB2_T_$(target)_H_$(CFG_BUILD))/$(call CFG_LIB_GLOB_$(target),$(crate)) \
$(CFG_ADB_TEST_DIR)/$(target))), \
Copy link
Member

Choose a reason for hiding this comment

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

It looks like the upload directory here changed from $(CFG_ADB_TEST_DIR) to ../$(target), maybe that caused a problem?

Copy link
Member

Choose a reason for hiding this comment

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

Oh but I see that LD_LIBRARY_PATH below changed. Perhaps somewhere else needs to be updated as well?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, in fact I think I changed everywhere that uses $(CFG_ADB_TEST_DIR).
And I succeeded passing the whole testset on android, in my local environment.
(with platform-19 emulator and 64-bit ubuntu server, same as buildbot.)

@ejjeong
Copy link
Contributor Author

ejjeong commented Feb 10, 2015

I succeeded to reproduce the error by running tests separately, and removed the error.
r? @alexcrichton

@alexcrichton
Copy link
Member

@bors: r+ 489f604

@bors
Copy link
Contributor

bors commented Feb 10, 2015

⌛ Testing commit 489f604 with merge be28540...

@bors
Copy link
Contributor

bors commented Feb 10, 2015

💔 Test failed - auto-linux-64-x-android-t

@ejjeong
Copy link
Contributor Author

ejjeong commented Feb 11, 2015

Added solib-search-path to help debugger find the correct library.
r? @alexcrichton

@alexcrichton
Copy link
Member

@bors: r+ 4f14111

@bors
Copy link
Contributor

bors commented Feb 11, 2015

⌛ Testing commit 4f14111 with merge bf43b03...

@bors
Copy link
Contributor

bors commented Feb 11, 2015

💔 Test failed - auto-linux-64-x-android-t

@ejjeong
Copy link
Contributor Author

ejjeong commented Feb 12, 2015

It seems like it's the same issue as #11352.
@alexcrichton, could you check the version of gdb on buildbot? (gdb in android standalone toolchain)
if it's gdb 7.3, it cannot understand DWARF4 format.

Anyway, I think that the required NDK version for building android should be updated.
(and also for the buildbot, if it has the old gdb)
Before android ndk version r10, it only supports gdb-7.3,
and it doesn't understand DWARF4 format generated by LLVM by default.

(Alternative options)

  1. Passing -C llvm-args="-dwarf-version=2" only when building debuginfo-test for old gdb
    => doesn't seem to work now. (I'm not sure this approach even makes sense.)
  2. forcing DWARF2 for all android OS (like in Add appropriate LLVM module flags for debug info. #11864)
    => gdb in recent android ndk already supports DWARF4.

@alexcrichton
Copy link
Member

Could the default dwarf version be lowered for android for now? We still do it for OSX and it's far easier than updating the bots.

@ejjeong
Copy link
Contributor Author

ejjeong commented Feb 16, 2015

@alexcrichton, I assumed that the gdb version of ndk on buildbot is 7.3,
and uploaded a patch that lowers the default dwarf version for android as you said.
And I created a new issue #22398 to remind this later.

@alexcrichton
Copy link
Member

@bors: r+ 194d96e

@bors
Copy link
Contributor

bors commented Feb 17, 2015

⌛ Testing commit 194d96e with merge bc74b37...

@bors
Copy link
Contributor

bors commented Feb 17, 2015

💔 Test failed - auto-win-64-opt

@Manishearth
Copy link
Member

/c/bot/slave/auto-win-64-opt/build/mk/tests.mk:379: recipe for target 'x86_64-pc-windows-gnu/stage2/test/stdtest-x86_64-pc-windows-gnu.exe' failed
error: linking with `gcc` failed: exit code: 1
note: "gcc" '"-Wl,--enable-long-section-names"' '"-fno-use-linker-plugin"' '"-Wl,--nxcompat"' '"-static-libgcc"' '"-m64"' '"-L"' '"C:\\bot\\slave\\auto-win-64-opt\\build\\obj\\x86_64-pc-windows-gnu\\stage2\\bin\\rustlib\\x86_64-pc-windows-gnu\\lib"' '"-o"' '"x86_64-pc-windows-gnu\\stage2\\test\\stdtest-x86_64-pc-windows-gnu.exe"' '"x86_64-pc-windows-gnu\\stage2\\test\\stdtest-x86_64-pc-windows-gnu.o"' '"-Wl,--gc-sections"' '"C:\\bot\\slave\\auto-win-64-opt\\build\\obj\\x86_64-pc-windows-gnu\\stage2\\bin\\rustlib\\x86_64-pc-windows-gnu\\lib\\libtest-4e7c5e5c.rlib"' '"C:\\bot\\slave\\auto-win-64-opt\\build\\obj\\x86_64-pc-windows-gnu\\stage2\\bin\\rustlib\\x86_64-pc-windows-gnu\\lib\\libgetopts-4e7c5e5c.rlib"' '"C:\\bot\\slave\\auto-win-64-opt\\build\\obj\\x86_64-pc-windows-gnu\\stage2\\bin\\rustlib\\x86_64-pc-windows-gnu\\lib\\libterm-4e7c5e5c.rlib"' '"C:\\bot\\slave\\auto-win-64-opt\\build\\obj\\x86_64-pc-windows-gnu\\stage2\\bin\\rustlib\\x86_64-pc-windows-gnu\\lib\\libserialize-4e7c5e5c.rlib"' '"C:\\bot\\slave\\auto-win-64-opt\\build\\obj\\x86_64-pc-windows-gnu\\stage2\\bin\\rustlib\\x86_64-pc-windows-gnu\\lib\\liblog-4e7c5e5c.rlib"' '"C:\\bot\\slave\\auto-win-64-opt\\build\\obj\\x86_64-pc-windows-gnu\\stage2\\bin\\rustlib\\x86_64-pc-windows-gnu\\lib\\libstd-4e7c5e5c.rlib"' '"C:\\bot\\slave\\auto-win-64-opt\\build\\obj\\x86_64-pc-windows-gnu\\stage2\\bin\\rustlib\\x86_64-pc-windows-gnu\\lib\\libcollections-4e7c5e5c.rlib"' '"C:\\bot\\slave\\auto-win-64-opt\\build\\obj\\x86_64-pc-windows-gnu\\stage2\\bin\\rustlib\\x86_64-pc-windows-gnu\\lib\\librand-4e7c5e5c.rlib"' '"C:\\bot\\slave\\auto-win-64-opt\\build\\obj\\x86_64-pc-windows-gnu\\stage2\\bin\\rustlib\\x86_64-pc-windows-gnu\\lib\\liballoc-4e7c5e5c.rlib"' '"C:\\bot\\slave\\auto-win-64-opt\\build\\obj\\x86_64-pc-windows-gnu\\stage2\\bin\\rustlib\\x86_64-pc-windows-gnu\\lib\\liblibc-4e7c5e5c.rlib"' '"C:\\bot\\slave\\auto-win-64-opt\\build\\obj\\x86_64-pc-windows-gnu\\stage2\\bin\\rustlib\\x86_64-pc-windows-gnu\\lib\\libunicode-4e7c5e5c.rlib"' '"C:\\bot\\slave\\auto-win-64-opt\\build\\obj\\x86_64-pc-windows-gnu\\stage2\\bin\\rustlib\\x86_64-pc-windows-gnu\\lib\\libcore-4e7c5e5c.rlib"' '"-L"' '"x86_64-pc-windows-gnu\\rt"' '"-L"' '"C:\\bot\\slave\\auto-win-64-opt\\build\\obj\\x86_64-pc-windows-gnu\\llvm\\Release+Asserts\\lib"' '"-L"' '"C:\\bot\\slave\\auto-win-64-opt\\build\\obj\\x86_64-pc-windows-gnu\\stage2\\bin\\rustlib\\x86_64-pc-windows-gnu\\lib"' '"-L"' '"C:\\bot\\slave\\auto-win-64-opt\\build\\obj\\.rust\\bin\\x86_64-pc-windows-gnu"' '"-L"' '"C:\\bot\\slave\\auto-win-64-opt\\build\\obj\\bin\\x86_64-pc-windows-gnu"' '"-Wl,--whole-archive"' '"-Wl,-Bstatic"' '"-Wl,--no-whole-archive"' '"-Wl,-Bdynamic"' '"-lws2_32"' '"-luserenv"' '"-lkernel32"' '"-lws2_32"' '"-luserenv"' '"-lcompiler-rt"'
note: C:/program files/mingw-w64/x86_64-4.9.1-win32-seh-rt_v3-rev1/mingw64/bin/../lib/gcc/x86_64-w64-mingw32/4.9.1/../../../../x86_64-w64-mingw32/bin/ld.exe: cannot open output file x86_64-pc-windows-gnu\stage2\test\stdtest-x86_64-pc-windows-gnu.exe: Permission denied
collect2.exe: error: ld returned 1 exit status

error: aborting due to previous error
make: *** [x86_64-pc-windows-gnu/stage2/test/stdtest-x86_64-pc-windows-gnu.exe] Error 101

@alexcrichton
Copy link
Member

@bors: retry

@bors
Copy link
Contributor

bors commented Feb 17, 2015

⌛ Testing commit 194d96e with merge 72c0393...

@bors
Copy link
Contributor

bors commented Feb 17, 2015

💔 Test failed - auto-win-32-nopt-t

@alexcrichton
Copy link
Member

@bors: retry

@bors
Copy link
Contributor

bors commented Feb 17, 2015

⌛ Testing commit 194d96e with merge 6c065fc...

bors added a commit that referenced this pull request Feb 17, 2015
- Now "make check-stage2-T-aarch64-linux-android-H-x86_64-unknown-linux-gnu" works (#21773)
- Fix & enable debuginfo tests for android (#10381)
- Fix & enable more tests for android (both for arm/aarch64)
- Enable many already-pass tests on android (both for arm/aarch64)
@bors bors merged commit 194d96e into rust-lang:master Feb 17, 2015
Manishearth added a commit to Manishearth/rust that referenced this pull request Feb 24, 2015
…excrichton

 This commit has already been merged in rust-lang#21774,
but i think it has been accidently overriden by rust-lang#22584 and rust-lang#22480.
r? @alexcrichton
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.

5 participants