Change ui test that are run-pass and that do not test the compiler to library tests #79038

CDirkx · 2020-11-14T02:08:40Z

Part of #76268, these are some of the relevant ui tests I found that can be replaced by library tests.

Note: this PR just moves the tests, I have not checked for any overlap between these tests and existing library tests. The only test I changed is env_home_dir, where I added code to restore the old home dir after testing.

All moved tests:

ui test	library test file	test
`const\ascii_ctype.rs`	`core\tests\ascii.rs`	`ascii_ctype_const`
`const\const-str-ptr.rs`	`alloc\tests\str.rs`	`const_str_ptr`
`assert-eq-trailing-comma.rs`	`core\tests\macros.rs`	`assert_eq_trailing_comma`
`assert-escape.rs`	`core\tests\macros.rs`	`assert_escape`
`assert-ne-trailing-comma.rs`	`core\tests\macros.rs`	`assert_ne_trailing_comma`
`atomic-access-bool.rs`	`core\tests\atomic.rs`	`atomic_access_bool`
`atomic-alignment.rs`	`core\tests\atomic.rs`	`atomic_alignment`
`atomic-compare_exchange.rs`	`core\tests\atomic.rs`	`atomic_compare_exchange`
~~`atomic-print.rs`~~	~~`std\tests\process.rs`~~	~~`atomic_print`~~
`bool.rs`	`core\tests\bool.rs`	`test_bool`
`bool_not.rs`	`core\tests\bool.rs`	`test_bool_not`
`char_unicode.rs`	`core\tests\unicode.rs`	`version`
`cmp-default.rs`	`core\tests\cmp.rs`	`cmp_default`
`deref-mut-on-ref.rs`	`core\tests\ops.rs`	`deref_mut_on_ref`
`deref-on-ref.rs`	`core\tests\ops.rs`	`deref_on_ref`
`env-home-dir.rs`	`std\tests\env.rs`	`env_home_dir`
~~`env-vars.rs`~~	~~`std\tests\env.rs`~~	~~`env_vars`~~
`extend-for-unit.rs`	`core\tests\iter.rs`	`extend_for_unit`
`offset_from.rs`	`core\tests\ptr.rs`	`offset_from`
`option-ext.rs`	`core\tests\option.rs`	`option_ext`
`result-opt-conversions.rs`	`core\tests\result.rs`	`result_opt_conversions`
`sleep.rs`	`std\tests\thread.rs`	`sleep`
~~`try-wait.rs`~~	~~`std\tests\process.rs`~~	~~`try_wait`~~
`utf8.rs`	`alloc\tests\str.rs`	`utf8`
`utf8_chars.rs`	`alloc\tests\str.rs`	`utf8_chars`
`wrapping-int-api.rs`	`core\tests\num\wrapping.rs`	`wrapping_int_api`

rust-highfive · 2020-11-14T02:08:43Z

r? @dtolnay

(rust_highfive has picked a reviewer for you, use r? to override)

bors · 2020-11-17T01:47:11Z

☔ The latest upstream changes (presumably #79104) made this pull request unmergeable. Please resolve the merge conflicts.

Note that reviewers usually do not review pull requests until merge conflicts are resolved! Once you resolve the conflicts, you should change the labels applied by bors to indicate that your PR is ready for review. Post this as a comment to change the labels:

@rustbot modify labels: +S-waiting-on-review -S-waiting-on-author

CDirkx · 2020-11-17T03:28:09Z

env-vars.rs has been excluded from this move, as when run as a library test the other tests could interfere with it.

dtolnay

Thank you, this is great.

dtolnay · 2020-11-22T04:32:29Z

@bors r+

Note: not reviewed with full scrutiny, just confirmed that the PR only touches cfg(test) code and the +/- line count is sane.

bors · 2020-11-22T04:32:30Z

📌 Commit 9603d0b4d5d217ef61538b4ccaa0eee51aea5435 has been approved by dtolnay

bors · 2020-11-22T06:56:08Z

⌛ Testing commit 9603d0b4d5d217ef61538b4ccaa0eee51aea5435 with merge 34c876fe5eb3caae834b19dd2ce0034a9fb1c10a...

bors · 2020-11-22T07:21:06Z

💔 Test failed - checks-actions

CDirkx · 2020-11-22T08:35:52Z

Excluding atomic-print.rs and try-wait.rs as well, upon closer inspection these tests were not working as intended.

These tests communicate with another process spawned using std::process::Command::new(std::env::current_exe()) and expected specific values for certain std::env::args(). However when running as a #[test] vs as a ui test the supplied arguments are different. The code could be changed to work as a library test, but I think they are fine staying as ui tests.

CDirkx · 2020-11-22T09:09:43Z

@bors retry

bors · 2020-11-22T09:09:45Z

@CDirkx: 🔑 Insufficient privileges: not in try users

bors · 2020-11-23T21:53:13Z

☔ The latest upstream changes (presumably #78439) made this pull request unmergeable. Please resolve the merge conflicts.

Note that reviewers usually do not review pull requests until merge conflicts are resolved! Once you resolve the conflicts, you should change the labels applied by bors to indicate that your PR is ready for review. Post this as a comment to change the labels:

@rustbot modify labels: +S-waiting-on-review -S-waiting-on-author

dtolnay · 2020-11-24T00:36:21Z

@bors r+

bors · 2020-11-24T00:36:23Z

📌 Commit fcbe638 has been approved by dtolnay

Change ui test that are run-pass and that do not test the compiler to library tests Part of rust-lang#76268, these are some of the relevant ui tests I found that can be replaced by library tests. Note: this PR just moves the tests, I have not checked for any overlap between these tests and existing library tests. The only test I changed is `env_home_dir`, where I added code to restore the old home dir after testing. All moved tests: | ui test | library test file | test | | --- | --- | --- | | `const\ascii_ctype.rs` | `core\tests\ascii.rs` | `ascii_ctype_const` | | `const\const-str-ptr.rs` | `alloc\tests\str.rs` | `const_str_ptr` | | `assert-eq-trailing-comma.rs` | `core\tests\macros.rs` | `assert_eq_trailing_comma` | | `assert-escape.rs` | `core\tests\macros.rs` | `assert_escape` | | `assert-ne-trailing-comma.rs` | `core\tests\macros.rs` | `assert_ne_trailing_comma` | | `atomic-access-bool.rs` | `core\tests\atomic.rs` | `atomic_access_bool` | | `atomic-alignment.rs` | `core\tests\atomic.rs` | `atomic_alignment` | | `atomic-compare_exchange.rs` | `core\tests\atomic.rs` | `atomic_compare_exchange` | | ~~`atomic-print.rs`~~ | ~~`std\tests\process.rs`~~ | ~~`atomic_print`~~ | | `bool.rs` | `core\tests\bool.rs` | `test_bool` | | `bool_not.rs` | `core\tests\bool.rs` | `test_bool_not` | | `char_unicode.rs` | `core\tests\unicode.rs` | `version` | | `cmp-default.rs` | `core\tests\cmp.rs` | `cmp_default` | | `deref-mut-on-ref.rs` | `core\tests\ops.rs` | `deref_mut_on_ref` | | `deref-on-ref.rs` | `core\tests\ops.rs` | `deref_on_ref` | | `env-home-dir.rs` | `std\tests\env.rs` | `env_home_dir` | | ~~`env-vars.rs`~~ | ~~`std\tests\env.rs`~~ | ~~`env_vars`~~ | | `extend-for-unit.rs` | `core\tests\iter.rs` | `extend_for_unit` | | `offset_from.rs` | `core\tests\ptr.rs` | `offset_from` | | `option-ext.rs` | `core\tests\option.rs` | `option_ext` | | `result-opt-conversions.rs` | `core\tests\result.rs` | `result_opt_conversions` | | `sleep.rs` | `std\tests\thread.rs` | `sleep` | | ~~`try-wait.rs`~~ | ~~`std\tests\process.rs`~~ | ~~`try_wait`~~ | | `utf8.rs` | `alloc\tests\str.rs` | `utf8` | | `utf8_chars.rs` | `alloc\tests\str.rs` | `utf8_chars` | | `wrapping-int-api.rs` | `core\tests\num\wrapping.rs` | `wrapping_int_api` |

CDirkx · 2020-11-30T01:59:17Z

@rustbot modify labels: +S-waiting-on-review -S-waiting-on-author
Rebased and resolved the merge conflict again 😅

jyn514 · 2020-11-30T02:18:30Z

@bors r=dtolnay

bors · 2020-11-30T02:18:31Z

📌 Commit be554c4 has been approved by dtolnay

Change ui test that are run-pass and that do not test the compiler to library tests Part of rust-lang#76268, these are some of the relevant ui tests I found that can be replaced by library tests. Note: this PR just moves the tests, I have not checked for any overlap between these tests and existing library tests. The only test I changed is `env_home_dir`, where I added code to restore the old home dir after testing. All moved tests: | ui test | library test file | test | | --- | --- | --- | | `const\ascii_ctype.rs` | `core\tests\ascii.rs` | `ascii_ctype_const` | | `const\const-str-ptr.rs` | `alloc\tests\str.rs` | `const_str_ptr` | | `assert-eq-trailing-comma.rs` | `core\tests\macros.rs` | `assert_eq_trailing_comma` | | `assert-escape.rs` | `core\tests\macros.rs` | `assert_escape` | | `assert-ne-trailing-comma.rs` | `core\tests\macros.rs` | `assert_ne_trailing_comma` | | `atomic-access-bool.rs` | `core\tests\atomic.rs` | `atomic_access_bool` | | `atomic-alignment.rs` | `core\tests\atomic.rs` | `atomic_alignment` | | `atomic-compare_exchange.rs` | `core\tests\atomic.rs` | `atomic_compare_exchange` | | ~~`atomic-print.rs`~~ | ~~`std\tests\process.rs`~~ | ~~`atomic_print`~~ | | `bool.rs` | `core\tests\bool.rs` | `test_bool` | | `bool_not.rs` | `core\tests\bool.rs` | `test_bool_not` | | `char_unicode.rs` | `core\tests\unicode.rs` | `version` | | `cmp-default.rs` | `core\tests\cmp.rs` | `cmp_default` | | `deref-mut-on-ref.rs` | `core\tests\ops.rs` | `deref_mut_on_ref` | | `deref-on-ref.rs` | `core\tests\ops.rs` | `deref_on_ref` | | `env-home-dir.rs` | `std\tests\env.rs` | `env_home_dir` | | ~~`env-vars.rs`~~ | ~~`std\tests\env.rs`~~ | ~~`env_vars`~~ | | `extend-for-unit.rs` | `core\tests\iter.rs` | `extend_for_unit` | | `offset_from.rs` | `core\tests\ptr.rs` | `offset_from` | | `option-ext.rs` | `core\tests\option.rs` | `option_ext` | | `result-opt-conversions.rs` | `core\tests\result.rs` | `result_opt_conversions` | | `sleep.rs` | `std\tests\thread.rs` | `sleep` | | ~~`try-wait.rs`~~ | ~~`std\tests\process.rs`~~ | ~~`try_wait`~~ | | `utf8.rs` | `alloc\tests\str.rs` | `utf8` | | `utf8_chars.rs` | `alloc\tests\str.rs` | `utf8_chars` | | `wrapping-int-api.rs` | `core\tests\num\wrapping.rs` | `wrapping_int_api` |

Rollup of 11 pull requests Successful merges: - rust-lang#79038 (Change ui test that are run-pass and that do not test the compiler to library tests) - rust-lang#79184 (Stop adding '*' at the end of slice and str typenames for MSVC case) - rust-lang#79227 (Remove const_fn_feature_flags test) - rust-lang#79444 (Move const ip in ui test to unit test) - rust-lang#79522 (Validate lint docs separately.) - rust-lang#79525 (Add -Z normalize-docs and enable it for compiler docs) - rust-lang#79527 (Move intra-doc link tests into a subdirectory) - rust-lang#79548 (Show since when a function is const in stdlib) - rust-lang#79568 (update Miri) - rust-lang#79573 (Update with status for various NetBSD ports.) - rust-lang#79583 (Update books) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup

jethrogb · 2020-12-01T13:59:29Z

library/std/tests/env.rs

@@ -1,5 +1,6 @@
 use std::env::*;
 use std::ffi::{OsStr, OsString};
+use std::path::PathBuf;


Unused import on cfg(target_env = "sgx") (deny lint)

Broken in rust-lang#79038

…lacrum Fix SGX CI Broken in rust-lang#79038

Broken in rust-lang#79038

RalfJung · 2020-12-02T09:21:54Z

library/alloc/tests/str.rs

+
+    unsafe {
+        let foo = &A as *const u8;
+        assert_eq!(foo, C);


I am not sure if this equality is truly guaranteed... at least it currently does not hold in Miri. This is probably related to rust-lang/miri#131.

…lacrum Fix SGX CI Broken in rust-lang#79038

Broken in rust-lang#79038

…crum Fix SGX CI, take 3 Broken in rust-lang#79038 r? `@Mark-Simulacrum` I actually ran `./x.py test --target x86_64-fortanix-unknown-sgx` on the commit before submitting it this time.

rust-highfive assigned dtolnay Nov 14, 2020

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 14, 2020

CDirkx force-pushed the move-ui-tests branch 2 times, most recently from 019f175 to 9603d0b Compare November 17, 2020 03:26

jyn514 mentioned this pull request Nov 19, 2020

Added tests in int module library as a part of #76268 #79163

Closed

dtolnay approved these changes Nov 22, 2020

View reviewed changes

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Nov 22, 2020

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Nov 22, 2020

CDirkx force-pushed the move-ui-tests branch from 9603d0b to 0865094 Compare November 22, 2020 08:18

CDirkx force-pushed the move-ui-tests branch from 0865094 to fcbe638 Compare November 23, 2020 22:16

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Nov 24, 2020

Dylan-DPC-zz mentioned this pull request Nov 24, 2020

Rollup of 12 pull requests #79369

Closed

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Nov 30, 2020

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Nov 30, 2020

Dylan-DPC-zz mentioned this pull request Nov 30, 2020

Rollup of 7 pull requests #79550

Closed

This was referenced Dec 1, 2020

Rollup of 12 pull requests #79595

Closed

Rollup of 11 pull requests #79596

Merged

jethrogb reviewed Dec 1, 2020

View reviewed changes

bors merged commit b565fe2 into rust-lang:master Dec 1, 2020

rustbot added this to the 1.50.0 milestone Dec 1, 2020

jethrogb mentioned this pull request Dec 1, 2020

Fix SGX CI #79602

Merged

jethrogb pushed a commit to jethrogb/rust that referenced this pull request Dec 1, 2020

Fix SGX CI

af7280b

Broken in rust-lang#79038

GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Dec 1, 2020

Rollup merge of rust-lang#79602 - jethrogb:sgx-fix-79038, r=Mark-Simu…

b6d9abe

…lacrum Fix SGX CI Broken in rust-lang#79038

jethrogb pushed a commit to jethrogb/rust that referenced this pull request Dec 1, 2020

Fix SGX CI

b787d72

Broken in rust-lang#79038

RalfJung reviewed Dec 2, 2020

View reviewed changes

GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Dec 3, 2020

Rollup merge of rust-lang#79602 - jethrogb:sgx-fix-79038, r=Mark-Simu…

d0c75bc

…lacrum Fix SGX CI Broken in rust-lang#79038

Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Dec 4, 2020

Rollup merge of rust-lang#79602 - jethrogb:sgx-fix-79038, r=Mark-Simu…

6b42900

…lacrum Fix SGX CI Broken in rust-lang#79038

jethrogb mentioned this pull request Dec 7, 2020

Fix SGX CI, take 3 #79797

Merged

jethrogb pushed a commit to jethrogb/rust that referenced this pull request Dec 7, 2020

Fix SGX CI, take 3

9703bb8

Broken in rust-lang#79038

GroteGnoom mentioned this pull request Jan 7, 2021

Tracking Issue for moving UI tests for libstd into unit tests #76268

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Change ui test that are run-pass and that do not test the compiler to library tests #79038

Change ui test that are run-pass and that do not test the compiler to library tests #79038

CDirkx commented Nov 14, 2020 •

edited

Loading

rust-highfive commented Nov 14, 2020

bors commented Nov 17, 2020

CDirkx commented Nov 17, 2020 •

edited

Loading

dtolnay left a comment

dtolnay commented Nov 22, 2020

bors commented Nov 22, 2020

bors commented Nov 22, 2020

bors commented Nov 22, 2020

CDirkx commented Nov 22, 2020

CDirkx commented Nov 22, 2020

bors commented Nov 22, 2020

bors commented Nov 23, 2020

dtolnay commented Nov 24, 2020

bors commented Nov 24, 2020

CDirkx commented Nov 30, 2020 •

edited

Loading

jyn514 commented Nov 30, 2020

bors commented Nov 30, 2020

jethrogb Dec 1, 2020 •

edited

Loading

RalfJung Dec 2, 2020

Change ui test that are run-pass and that do not test the compiler to library tests #79038

Change ui test that are run-pass and that do not test the compiler to library tests #79038

Conversation

CDirkx commented Nov 14, 2020 • edited Loading

rust-highfive commented Nov 14, 2020

bors commented Nov 17, 2020

CDirkx commented Nov 17, 2020 • edited Loading

dtolnay left a comment

Choose a reason for hiding this comment

dtolnay commented Nov 22, 2020

bors commented Nov 22, 2020

bors commented Nov 22, 2020

bors commented Nov 22, 2020

CDirkx commented Nov 22, 2020

CDirkx commented Nov 22, 2020

bors commented Nov 22, 2020

bors commented Nov 23, 2020

dtolnay commented Nov 24, 2020

bors commented Nov 24, 2020

CDirkx commented Nov 30, 2020 • edited Loading

jyn514 commented Nov 30, 2020

bors commented Nov 30, 2020

jethrogb Dec 1, 2020 • edited Loading

Choose a reason for hiding this comment

RalfJung Dec 2, 2020

Choose a reason for hiding this comment

CDirkx commented Nov 14, 2020 •

edited

Loading

CDirkx commented Nov 17, 2020 •

edited

Loading

CDirkx commented Nov 30, 2020 •

edited

Loading

jethrogb Dec 1, 2020 •

edited

Loading