dnrops
/
rust
mirror of https://github.com/rust-lang/rust.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tests/run-make: Use RUSTC_TEST_OP in more places

This commit is contained in:
Martin Nordholts 2023-10-07 08:23:10 +02:00
parent 88966c4773
commit d9a7afec8b
8 changed files with 11 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/run-make/const_fn_mir/Makefile
View File

@ -3,9 +3,4 @@ include ../tools.mk
all:
$(RUSTC) main.rs --emit=mir -o "$(TMPDIR)"/dump.mir
ifdef RUSTC_BLESS_TEST
cp "$(TMPDIR)"/dump.mir dump.mir
else
$(DIFF) dump.mir "$(TMPDIR)"/dump.mir
endif
$(RUSTC_TEST_OP) "$(TMPDIR)"/dump.mir dump.mir

10
tests/run-make/overwrite-input/Makefile
View File

@ -3,11 +3,5 @@ include ../tools.mk
all:
$(RUSTC) main.rs -o main.rs 2> $(TMPDIR)/file.stderr || echo "failed successfully"
$(RUSTC) main.rs -o . 2> $(TMPDIR)/folder.stderr || echo "failed successfully"
ifdef RUSTC_BLESS_TEST
cp "$(TMPDIR)"/file.stderr file.stderr
cp "$(TMPDIR)"/folder.stderr folder.stderr
else
$(DIFF) file.stderr "$(TMPDIR)"/file.stderr
$(DIFF) folder.stderr "$(TMPDIR)"/folder.stderr
endif
$(RUSTC_TEST_OP) "$(TMPDIR)"/file.stderr file.stderr
$(RUSTC_TEST_OP) "$(TMPDIR)"/folder.stderr folder.stderr

12
tests/run-make/raw-dylib-alt-calling-convention/Makefile
View File

@ -16,17 +16,9 @@ else
endif
"$(TMPDIR)"/driver > "$(TMPDIR)"/output.txt
ifdef RUSTC_BLESS_TEST
cp "$(TMPDIR)"/output.txt output.txt
else
$(DIFF) output.txt "$(TMPDIR)"/output.txt
endif
$(RUSTC_TEST_OP) "$(TMPDIR)"/output.txt output.txt
ifdef IS_MSVC
"$(TMPDIR)"/driver true > "$(TMPDIR)"/output.msvc.txt
ifdef RUSTC_BLESS_TEST
cp "$(TMPDIR)"/output.msvc.txt output.msvc.txt
else
$(DIFF) output.msvc.txt "$(TMPDIR)"/output.msvc.txt
endif
$(RUSTC_TEST_OP) "$(TMPDIR)"/output.msvc.txt output.msvc.txt
endif

7
tests/run-make/raw-dylib-import-name-type/Makefile
View File

@ -14,9 +14,4 @@ else
$(CC) "$(TMPDIR)"/extern.obj extern.gnu.def --no-leading-underscore -shared -o "$(TMPDIR)"/extern.dll
endif
"$(TMPDIR)"/driver > "$(TMPDIR)"/output.txt
ifdef RUSTC_BLESS_TEST
cp "$(TMPDIR)"/output.txt output.txt
else
$(DIFF) output.txt "$(TMPDIR)"/output.txt
endif
$(RUSTC_TEST_OP) "$(TMPDIR)"/output.txt output.txt

7
tests/run-make/raw-dylib-inline-cross-dylib/Makefile
View File

@ -27,9 +27,4 @@ else
$(CC) "$(TMPDIR)"/extern_2.obj -shared -o "$(TMPDIR)"/extern_2.dll
endif
$(call RUN,driver) > "$(TMPDIR)"/output.txt
ifdef RUSTC_BLESS_TEST
cp "$(TMPDIR)"/output.txt output.txt
else
$(DIFF) output.txt "$(TMPDIR)"/output.txt
endif
$(RUSTC_TEST_OP) "$(TMPDIR)"/output.txt output.txt

7
tests/run-make/raw-dylib-link-ordinal/Makefile
View File

@ -14,9 +14,4 @@ else
$(CC) "$(TMPDIR)"/exporter.obj exporter.def -shared -o "$(TMPDIR)"/exporter.dll
endif
"$(TMPDIR)"/driver > "$(TMPDIR)"/output.txt
ifdef RUSTC_BLESS_TEST
cp "$(TMPDIR)"/output.txt output.txt
else
$(DIFF) output.txt "$(TMPDIR)"/output.txt
endif
$(RUSTC_TEST_OP) "$(TMPDIR)"/output.txt output.txt

7
tests/run-make/raw-dylib-stdcall-ordinal/Makefile
View File

@ -15,9 +15,4 @@ else
$(CC) "$(TMPDIR)"/exporter.obj exporter-gnu.def -shared -o "$(TMPDIR)"/exporter.dll
endif
"$(TMPDIR)"/driver > "$(TMPDIR)"/actual_output.txt
ifdef RUSTC_BLESS_TEST
cp "$(TMPDIR)"/actual_output.txt expected_output.txt
else
$(DIFF) expected_output.txt "$(TMPDIR)"/actual_output.txt
endif
$(RUSTC_TEST_OP) "$(TMPDIR)"/actual_output.txt expected_output.txt

10
tests/run-make/unknown-mod-stdin/Makefile
View File

@ -4,11 +4,5 @@ include ../tools.mk
all:
echo 'mod unknown;' | $(RUSTC) --crate-type rlib - >$(TMPDIR)/unknown-mod.stdout 2>$(TMPDIR)/unknown-mod.stderr || echo "failed successfully"
ifdef RUSTC_BLESS_TEST
cp "$(TMPDIR)"/unknown-mod.stdout unknown-mod.stdout
cp "$(TMPDIR)"/unknown-mod.stderr unknown-mod.stderr
else
$(DIFF) unknown-mod.stdout "$(TMPDIR)"/unknown-mod.stdout
$(DIFF) unknown-mod.stderr "$(TMPDIR)"/unknown-mod.stderr
endif
$(RUSTC_TEST_OP) "$(TMPDIR)"/unknown-mod.stdout unknown-mod.stdout
$(RUSTC_TEST_OP) "$(TMPDIR)"/unknown-mod.stderr unknown-mod.stderr