Skip to content

Commit 2671f37

Browse files
Change src/test to tests in source files, fix tidy and tests
1 parent 26c010c commit 2671f37

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

test.sh

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -253,25 +253,25 @@ rustc = "$HOME/.rustup/toolchains/$rust_toolchain-$TARGET_TRIPLE/bin/rustc"
253253
EOF
254254

255255
rustc -V | cut -d' ' -f3 | tr -d '('
256-
git checkout $(rustc -V | cut -d' ' -f3 | tr -d '(') src/test
256+
git checkout $(rustc -V | cut -d' ' -f3 | tr -d '(') tests
257257

258-
for test in $(rg -i --files-with-matches "//(\[\w+\])?~|// error-pattern:|// build-fail|// run-fail|-Cllvm-args" src/test/ui); do
258+
for test in $(rg -i --files-with-matches "//(\[\w+\])?~|// error-pattern:|// build-fail|// run-fail|-Cllvm-args" tests/ui); do
259259
rm $test
260260
done
261261

262-
git checkout -- src/test/ui/issues/auxiliary/issue-3136-a.rs # contains //~ERROR, but shouldn't be removed
262+
git checkout -- tests/ui/issues/auxiliary/issue-3136-a.rs # contains //~ERROR, but shouldn't be removed
263263

264-
rm -r src/test/ui/{abi*,extern/,panic-runtime/,panics/,unsized-locals/,proc-macro/,threads-sendsync/,thinlto/,borrowck/,test*,*lto*.rs} || true
265-
for test in $(rg --files-with-matches "catch_unwind|should_panic|thread|lto" src/test/ui); do
264+
rm -r tests/ui/{abi*,extern/,panic-runtime/,panics/,unsized-locals/,proc-macro/,threads-sendsync/,thinlto/,borrowck/,test*,*lto*.rs} || true
265+
for test in $(rg --files-with-matches "catch_unwind|should_panic|thread|lto" tests/ui); do
266266
rm $test
267267
done
268-
git checkout src/test/ui/type-alias-impl-trait/auxiliary/cross_crate_ice.rs
269-
git checkout src/test/ui/type-alias-impl-trait/auxiliary/cross_crate_ice2.rs
268+
git checkout tests/ui/type-alias-impl-trait/auxiliary/cross_crate_ice.rs
269+
git checkout tests/ui/type-alias-impl-trait/auxiliary/cross_crate_ice2.rs
270270

271271
RUSTC_ARGS="-Zpanic-abort-tests -Csymbol-mangling-version=v0 -Zcodegen-backend="$(pwd)"/../target/"$CHANNEL"/librustc_codegen_gcc."$dylib_ext" --sysroot "$(pwd)"/../build_sysroot/sysroot -Cpanic=abort"
272272

273273
echo "[TEST] rustc test suite"
274-
COMPILETEST_FORCE_STAGE0=1 ./x.py test --run always --stage 0 src/test/ui/ --rustc-args "$RUSTC_ARGS"
274+
COMPILETEST_FORCE_STAGE0=1 ./x.py test --run always --stage 0 tests/ui/ --rustc-args "$RUSTC_ARGS"
275275
}
276276

277277
function clean_ui_tests() {

0 commit comments

Comments
 (0)