diff options
| author | Eduard-Mihai Burtescu <edy.burt@gmail.com> | 2019-05-02 05:06:08 +0300 |
|---|---|---|
| committer | Eduard-Mihai Burtescu <edy.burt@gmail.com> | 2019-05-07 04:49:54 +0300 |
| commit | f0e43fc98671f76f7cdcc07cfa17fb2362c132ea (patch) | |
| tree | 137dace7a1508fa8db1b8bccbaafef6f77cbebf3 /src/test | |
| parent | 9a2ee0aaef1dfe835c65359b2b07721953ea7040 (diff) | |
| download | rust-f0e43fc98671f76f7cdcc07cfa17fb2362c132ea.tar.gz rust-f0e43fc98671f76f7cdcc07cfa17fb2362c132ea.zip | |
compiletest: only use `make_exe_name` for tests that end up being executed.
Diffstat (limited to 'src/test')
4 files changed, 4 insertions, 9 deletions
diff --git a/src/test/ui/consts/const-eval/unused-broken-const.stderr b/src/test/ui/consts/const-eval/unused-broken-const.stderr index 603efe449f1..e45ce65d8bb 100644 --- a/src/test/ui/consts/const-eval/unused-broken-const.stderr +++ b/src/test/ui/consts/const-eval/unused-broken-const.stderr @@ -1,5 +1,3 @@ -warning: due to multiple output types requested, the explicitly specified output file name will be adapted for each output type - error: any use of this value will cause an error --> $DIR/unused-broken-const.rs:5:18 | diff --git a/src/test/ui/emit-directives.rs b/src/test/ui/emit-directives.rs index 088280e358a..924569d3e23 100644 --- a/src/test/ui/emit-directives.rs +++ b/src/test/ui/emit-directives.rs @@ -1,11 +1,5 @@ -// ignore-tidy-linelength // compile-flags:--emit=metadata --error-format=json -Z emit-directives // compile-pass -// -// Normalization is required to eliminated minor path and filename differences -// across platforms. -// normalize-stderr-test: "metadata file written: .*/emit-directives" -> "metadata file written: .../emit-directives" -// normalize-stderr-test: "emit-directives(\.\w*)?/a(\.\w*)?" -> "emit-directives/a" // A very basic test for the emission of build directives in JSON output. diff --git a/src/test/ui/emit-directives.stderr b/src/test/ui/emit-directives.stderr index b8a4b96f4bf..068745edb8d 100644 --- a/src/test/ui/emit-directives.stderr +++ b/src/test/ui/emit-directives.stderr @@ -1 +1 @@ -{"directive":"metadata file written: .../emit-directives/a"} +{"directive":"metadata file written: $TEST_BUILD_DIR/emit-directives/libemit_directives.rmeta"} diff --git a/src/test/ui/traits/trait-object-with-self-in-projection-output-repeated-supertrait.rs b/src/test/ui/traits/trait-object-with-self-in-projection-output-repeated-supertrait.rs index 46c083f9305..3e9f612a2af 100644 --- a/src/test/ui/traits/trait-object-with-self-in-projection-output-repeated-supertrait.rs +++ b/src/test/ui/traits/trait-object-with-self-in-projection-output-repeated-supertrait.rs @@ -1,5 +1,8 @@ // compile-pass +// FIXME(eddyb) shorten the name so windows doesn't choke on it. +#![crate_name = "trait_test"] + // Regression test related to #56288. Check that a supertrait projection (of // `Output`) that references `Self` is ok if there is another occurence of // the same supertrait that specifies the projection explicitly, even if |