Fix normalization

This shouldn't be necessary .... compiletest should do this
automatically :/ not sure what's going on here, something to do with
absolute vs relative paths.

Author: jyn514

tests/rustdoc-ui/doctest/force-merge.rs

@@ -1,7 +1,7 @@
 //@ check-pass
 //@ edition: 2018
 //@ compile-flags: --test --test-args=--test-threads=1 --merge-doctests=yes -Z unstable-options
-//@ normalize-stdout: "tests/rustdoc-ui" -> "$$DIR"
+//@ normalize-stdout: "tests/rustdoc-ui/doctest" -> "$$DIR"
 //@ normalize-stdout: "finished in \d+\.\d+s" -> "finished in $$TIME"
 //@ normalize-stdout: "ran in \d+\.\d+s" -> "ran in $$TIME"
 //@ normalize-stdout: "compilation took \d+\.\d+s" -> "compilation took $$TIME"

tests/rustdoc-ui/doctest/force-merge.stdout

@@ -1,7 +1,7 @@
 
 running 2 tests
-test $DIR/doctest/force-merge.rs - Foo (line 14) ... ok
-test $DIR/doctest/force-merge.rs - Foo (line 20) ... ok
+test $DIR/force-merge.rs - Foo (line 14) ... ok
+test $DIR/force-merge.rs - Foo (line 20) ... ok
 
 test result: ok. 2 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME
 

tests/rustdoc-ui/doctest/force-no-merge.rs

@@ -3,7 +3,7 @@
 //@ compile-flags: --test --test-args=--test-threads=1 --merge-doctests=no -Z unstable-options
 //@ normalize-stderr: ".*doctest_bundle_2018.rs:\d+:\d+" -> "doctest_bundle_2018.rs:$$LINE:$$COL"
 
-//@ normalize-stdout: "tests/rustdoc-ui" -> "$$DIR"
+//@ normalize-stdout: "tests/rustdoc-ui/doctest" -> "$$DIR"
 //@ normalize-stdout: "finished in \d+\.\d+s" -> "finished in $$TIME"
 //@ normalize-stdout: "ran in \d+\.\d+s" -> "ran in $$TIME"
 //@ normalize-stdout: "compilation took \d+\.\d+s" -> "compilation took $$TIME"

tests/rustdoc-ui/doctest/force-no-merge.stdout

@@ -1,7 +1,7 @@
 
 running 2 tests
-test $DIR/doctest/force-no-merge.rs - Foo (line 15) ... ok
-test $DIR/doctest/force-no-merge.rs - Foo (line 20) ... ok
+test $DIR/force-no-merge.rs - Foo (line 15) ... ok
+test $DIR/force-no-merge.rs - Foo (line 20) ... ok
 
 test result: ok. 2 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME
 

tests/rustdoc-ui/doctest/merge-doctests-auto.rs

@@ -4,7 +4,7 @@
 //@ edition: 2018
 //@ compile-flags: --test --test-args=--test-threads=1 --merge-doctests=auto -Z unstable-options
 
-//@ normalize-stdout: "tests/rustdoc-ui" -> "$$DIR"
+//@ normalize-stdout: "tests/rustdoc-ui/doctest" -> "$$DIR"
 //@ normalize-stdout: "finished in \d+\.\d+s" -> "finished in $$TIME"
 //@ normalize-stdout: "ran in \d+\.\d+s" -> "ran in $$TIME"
 //@ normalize-stdout: "compilation took \d+\.\d+s" -> "compilation took $$TIME"

tests/rustdoc-ui/doctest/merge-doctests-auto.stdout

@@ -1,7 +1,7 @@
 
 running 2 tests
-test $DIR/doctest/merge-doctests-auto.rs - Foo (line 17) ... ok
-test $DIR/doctest/merge-doctests-auto.rs - Foo (line 23) ... ok
+test $DIR/merge-doctests-auto.rs - Foo (line 17) ... ok
+test $DIR/merge-doctests-auto.rs - Foo (line 23) ... ok
 
 test result: ok. 2 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME