diff options
| author | David Wood <david@davidtw.co> | 2018-08-10 12:17:49 +0200 |
|---|---|---|
| committer | David Wood <david@davidtw.co> | 2018-08-14 11:12:11 +0200 |
| commit | 0cfc17358aa836440c8b58b364d147ad4ab305de (patch) | |
| tree | d0b60f01cdd5fe21aad8fb4ee95403175608c931 /src | |
| parent | a92264245521fea1b1c5e4cd4ce168432bec3d5a (diff) | |
Moved problematic tests on Windows back to compile-fail.
Diffstat (limited to 'src')
| -rw-r--r-- | src/test/compile-fail/auxiliary/crateresolve1-1.rs (renamed from src/test/ui/auxiliary/crateresolve1-1.rs) | 0 | ||||
| -rw-r--r-- | src/test/compile-fail/auxiliary/crateresolve1-2.rs (renamed from src/test/ui/auxiliary/crateresolve1-2.rs) | 0 | ||||
| -rw-r--r-- | src/test/compile-fail/auxiliary/crateresolve1-3.rs (renamed from src/test/ui/auxiliary/crateresolve1-3.rs) | 0 | ||||
| -rw-r--r-- | src/test/compile-fail/crateresolve1.rs (renamed from src/test/ui/crateresolve1.rs) | 2 | ||||
| -rw-r--r-- | src/test/compile-fail/issue-10755.rs (renamed from src/test/ui/issues/issue-10755.rs) | 0 | ||||
| -rw-r--r-- | src/test/compile-fail/nolink-with-link-args.rs (renamed from src/test/ui/nolink-with-link-args.rs) | 3 | ||||
| -rw-r--r-- | src/test/compile-fail/not-utf8.bin (renamed from src/test/ui/not-utf8.bin) | bin | 3036 -> 3036 bytes | |||
| -rw-r--r-- | src/test/compile-fail/not-utf8.rs (renamed from src/test/ui/not-utf8.rs) | 0 | ||||
| -rw-r--r-- | src/test/ui/crateresolve1.nll.stderr | 21 | ||||
| -rw-r--r-- | src/test/ui/crateresolve1.stderr | 21 | ||||
| -rw-r--r-- | src/test/ui/issues/issue-10755.stderr | 6 | ||||
| -rw-r--r-- | src/test/ui/nolink-with-link-args.nll.stderr | 9 | ||||
| -rw-r--r-- | src/test/ui/nolink-with-link-args.stderr | 9 | ||||
| -rw-r--r-- | src/test/ui/not-utf8.stderr | 8 |
14 files changed, 0 insertions, 79 deletions
diff --git a/src/test/ui/auxiliary/crateresolve1-1.rs b/src/test/compile-fail/auxiliary/crateresolve1-1.rs index 050f2fe7329..050f2fe7329 100644 --- a/src/test/ui/auxiliary/crateresolve1-1.rs +++ b/src/test/compile-fail/auxiliary/crateresolve1-1.rs diff --git a/src/test/ui/auxiliary/crateresolve1-2.rs b/src/test/compile-fail/auxiliary/crateresolve1-2.rs index d19b3bafba5..d19b3bafba5 100644 --- a/src/test/ui/auxiliary/crateresolve1-2.rs +++ b/src/test/compile-fail/auxiliary/crateresolve1-2.rs diff --git a/src/test/ui/auxiliary/crateresolve1-3.rs b/src/test/compile-fail/auxiliary/crateresolve1-3.rs index c5096ac49a8..c5096ac49a8 100644 --- a/src/test/ui/auxiliary/crateresolve1-3.rs +++ b/src/test/compile-fail/auxiliary/crateresolve1-3.rs diff --git a/src/test/ui/crateresolve1.rs b/src/test/compile-fail/crateresolve1.rs index 51af8124512..8c3dbda6802 100644 --- a/src/test/ui/crateresolve1.rs +++ b/src/test/compile-fail/crateresolve1.rs @@ -8,8 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// normalize-stderr-test: "crateresolve1\-\d.so" -> "crateresolve1-N.so" - // aux-build:crateresolve1-1.rs // aux-build:crateresolve1-2.rs // aux-build:crateresolve1-3.rs diff --git a/src/test/ui/issues/issue-10755.rs b/src/test/compile-fail/issue-10755.rs index 57915bce456..57915bce456 100644 --- a/src/test/ui/issues/issue-10755.rs +++ b/src/test/compile-fail/issue-10755.rs diff --git a/src/test/ui/nolink-with-link-args.rs b/src/test/compile-fail/nolink-with-link-args.rs index ba7a3adaa31..6dfd74f541e 100644 --- a/src/test/ui/nolink-with-link-args.rs +++ b/src/test/compile-fail/nolink-with-link-args.rs @@ -8,9 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// normalize-stderr-test: "-lstd-[\d\w]{16}" -> "-lstd-XXXXXXXXXXXXXXXX" -// normalize-stderr-test: "builtins-[\d\w]{16}.rlib" -> "builtins-XXXXXXXXXXXXXXXX.rlib" - // error-pattern:aFdEfSeVEE // compile-flags: -Z linker-flavor=ld diff --git a/src/test/ui/not-utf8.bin b/src/test/compile-fail/not-utf8.bin index 4148e5b88fe..4148e5b88fe 100644 --- a/src/test/ui/not-utf8.bin +++ b/src/test/compile-fail/not-utf8.bin Binary files differdiff --git a/src/test/ui/not-utf8.rs b/src/test/compile-fail/not-utf8.rs index 5331062d9b6..5331062d9b6 100644 --- a/src/test/ui/not-utf8.rs +++ b/src/test/compile-fail/not-utf8.rs diff --git a/src/test/ui/crateresolve1.nll.stderr b/src/test/ui/crateresolve1.nll.stderr deleted file mode 100644 index acaf7c1db21..00000000000 --- a/src/test/ui/crateresolve1.nll.stderr +++ /dev/null @@ -1,21 +0,0 @@ -error[E0464]: multiple matching crates for `crateresolve1` - --> $DIR/crateresolve1.rs:18:1 - | -LL | extern crate crateresolve1; - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ - | - = note: candidates: - crate `crateresolve1`: $TEST_BUILD_DIR/crateresolve1.nll/auxiliary/libcrateresolve1-N.so - crate `crateresolve1`: $TEST_BUILD_DIR/crateresolve1.nll/auxiliary/libcrateresolve1-N.so - crate `crateresolve1`: $TEST_BUILD_DIR/crateresolve1.nll/auxiliary/libcrateresolve1-N.so - -error[E0463]: can't find crate for `crateresolve1` - --> $DIR/crateresolve1.rs:18:1 - | -LL | extern crate crateresolve1; - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ can't find crate - -error: aborting due to 2 previous errors - -Some errors occurred: E0463, E0464. -For more information about an error, try `rustc --explain E0463`. diff --git a/src/test/ui/crateresolve1.stderr b/src/test/ui/crateresolve1.stderr deleted file mode 100644 index babcf6260e1..00000000000 --- a/src/test/ui/crateresolve1.stderr +++ /dev/null @@ -1,21 +0,0 @@ -error[E0464]: multiple matching crates for `crateresolve1` - --> $DIR/crateresolve1.rs:18:1 - | -LL | extern crate crateresolve1; - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ - | - = note: candidates: - crate `crateresolve1`: $TEST_BUILD_DIR/crateresolve1/auxiliary/libcrateresolve1-N.so - crate `crateresolve1`: $TEST_BUILD_DIR/crateresolve1/auxiliary/libcrateresolve1-N.so - crate `crateresolve1`: $TEST_BUILD_DIR/crateresolve1/auxiliary/libcrateresolve1-N.so - -error[E0463]: can't find crate for `crateresolve1` - --> $DIR/crateresolve1.rs:18:1 - | -LL | extern crate crateresolve1; - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ can't find crate - -error: aborting due to 2 previous errors - -Some errors occurred: E0463, E0464. -For more information about an error, try `rustc --explain E0463`. diff --git a/src/test/ui/issues/issue-10755.stderr b/src/test/ui/issues/issue-10755.stderr deleted file mode 100644 index db64944d44f..00000000000 --- a/src/test/ui/issues/issue-10755.stderr +++ /dev/null @@ -1,6 +0,0 @@ -error: linker `llllll` not found - | - = note: No such file or directory (os error 2) - -error: aborting due to previous error - diff --git a/src/test/ui/nolink-with-link-args.nll.stderr b/src/test/ui/nolink-with-link-args.nll.stderr deleted file mode 100644 index fc36c7c9349..00000000000 --- a/src/test/ui/nolink-with-link-args.nll.stderr +++ /dev/null @@ -1,9 +0,0 @@ -error: linking with `ld` failed: exit code: 1 - | - = note: "ld" "-L" "$BUILD_DIR/x86_64-unknown-linux-gnu/stage2/lib/rustlib/x86_64-unknown-linux-gnu/lib" "$TEST_BUILD_DIR/nolink-with-link-args.nll/a.nolink_with_link_args0-317d481089b8c8fe83113de504472633.rs.rcgu.o" "$TEST_BUILD_DIR/nolink-with-link-args.nll/a.nolink_with_link_args1-317d481089b8c8fe83113de504472633.rs.rcgu.o" "-o" "$TEST_BUILD_DIR/nolink-with-link-args.nll/a" "--gc-sections" "-pie" "-zrelro" "-znow" "-O1" "-L" "$BUILD_DIR/x86_64-unknown-linux-gnu/native/rust-test-helpers" "-L" "$TEST_BUILD_DIR/nolink-with-link-args.nll/auxiliary" "-L" "$BUILD_DIR/x86_64-unknown-linux-gnu/stage2/lib/rustlib/x86_64-unknown-linux-gnu/lib" "--start-group" "-L" "$BUILD_DIR/x86_64-unknown-linux-gnu/stage2/lib/rustlib/x86_64-unknown-linux-gnu/lib" "-lstd-XXXXXXXXXXXXXXXX" "--end-group" "-Bstatic" "$BUILD_DIR/x86_64-unknown-linux-gnu/stage2/lib/rustlib/x86_64-unknown-linux-gnu/lib/libcompiler_builtins-XXXXXXXXXXXXXXXX.rlib" "-Bdynamic" "-ldl" "-lrt" "-lpthread" "-lpthread" "-lgcc_s" "-lc" "-lm" "-lrt" "-lpthread" "-lutil" "-lutil" "-Wl,-rpath,$ORIGIN/../../../stage2/lib/rustlib/x86_64-unknown-linux-gnu/lib" "-Wl,-rpath,$LIB_DIR/rustlib/x86_64-unknown-linux-gnu/lib" "-Wl,--enable-new-dtags" "aFdEfSeVEEE" - = note: ld: unrecognized option '-Wl,-rpath,$ORIGIN/../../../stage2/lib/rustlib/x86_64-unknown-linux-gnu/lib' - ld: use the --help option for usage information - - -error: aborting due to previous error - diff --git a/src/test/ui/nolink-with-link-args.stderr b/src/test/ui/nolink-with-link-args.stderr deleted file mode 100644 index 03e7f476479..00000000000 --- a/src/test/ui/nolink-with-link-args.stderr +++ /dev/null @@ -1,9 +0,0 @@ -error: linking with `ld` failed: exit code: 1 - | - = note: "ld" "-L" "$BUILD_DIR/x86_64-unknown-linux-gnu/stage2/lib/rustlib/x86_64-unknown-linux-gnu/lib" "$TEST_BUILD_DIR/nolink-with-link-args/a.nolink_with_link_args0-317d481089b8c8fe83113de504472633.rs.rcgu.o" "$TEST_BUILD_DIR/nolink-with-link-args/a.nolink_with_link_args1-317d481089b8c8fe83113de504472633.rs.rcgu.o" "-o" "$TEST_BUILD_DIR/nolink-with-link-args/a" "--gc-sections" "-pie" "-zrelro" "-znow" "-O1" "-L" "$BUILD_DIR/x86_64-unknown-linux-gnu/native/rust-test-helpers" "-L" "$TEST_BUILD_DIR/nolink-with-link-args/auxiliary" "-L" "$BUILD_DIR/x86_64-unknown-linux-gnu/stage2/lib/rustlib/x86_64-unknown-linux-gnu/lib" "--start-group" "-L" "$BUILD_DIR/x86_64-unknown-linux-gnu/stage2/lib/rustlib/x86_64-unknown-linux-gnu/lib" "-lstd-XXXXXXXXXXXXXXXX" "--end-group" "-Bstatic" "$BUILD_DIR/x86_64-unknown-linux-gnu/stage2/lib/rustlib/x86_64-unknown-linux-gnu/lib/libcompiler_builtins-XXXXXXXXXXXXXXXX.rlib" "-Bdynamic" "-ldl" "-lrt" "-lpthread" "-lpthread" "-lgcc_s" "-lc" "-lm" "-lrt" "-lpthread" "-lutil" "-lutil" "-Wl,-rpath,$ORIGIN/../../../stage2/lib/rustlib/x86_64-unknown-linux-gnu/lib" "-Wl,-rpath,$LIB_DIR/rustlib/x86_64-unknown-linux-gnu/lib" "-Wl,--enable-new-dtags" "aFdEfSeVEEE" - = note: ld: unrecognized option '-Wl,-rpath,$ORIGIN/../../../stage2/lib/rustlib/x86_64-unknown-linux-gnu/lib' - ld: use the --help option for usage information - - -error: aborting due to previous error - diff --git a/src/test/ui/not-utf8.stderr b/src/test/ui/not-utf8.stderr deleted file mode 100644 index 28c23f4f348..00000000000 --- a/src/test/ui/not-utf8.stderr +++ /dev/null @@ -1,8 +0,0 @@ -error: couldn't read "$DIR/not-utf8.bin": stream did not contain valid UTF-8 - --> $DIR/not-utf8.rs:14:5 - | -LL | include!("not-utf8.bin") - | ^^^^^^^^^^^^^^^^^^^^^^^^ - -error: aborting due to previous error - |
