Skip to content

Move almost all run-make-fulldeps tests to run-make #109770

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bors merged 6 commits into from
Apr 3, 2023
Merged

Move almost all run-make-fulldeps tests to run-make #109770

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
433da1f
Move almost all run-make-fulldeps to run-make
jyn514 Mar 30, 2023
06b2d4b
fix wrong includes
jyn514 Mar 30, 2023
26e1ce7
move `tools.mk` to run-make
jyn514 Mar 30, 2023
8e214cb
fix `sysroot-crates-are-unstable` for cross-compilation
jyn514 Mar 30, 2023
4851d56
ignore failing cross-compiled run-make tests
jyn514 Mar 30, 2023
c45037b
try to fix test-various
jyn514 Apr 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix wrong includes
  • Loading branch information
@jyn514
jyn514 committed Mar 30, 2023
commit 06b2d4b4aba539efe86dc139fef7536533fe4026
2 changes: 1 addition & 1 deletion tests/run-make/issue-97463-abi-param-passing/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
-include ../tools.mk
include ../../run-make-fulldeps/tools.mk

# ignore-msvc

Expand Down
2 changes: 1 addition & 1 deletion tests/run-make/macos-fat-archive/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# only-macos

-include ../../run-make-fulldeps/tools.mk
include ../../run-make-fulldeps/tools.mk

"$(TMPDIR)"/libnative-library.a: native-library.c
$(CC) -arch arm64 -arch x86_64 native-library.c -c -o "$(TMPDIR)"/native-library.o
Expand Down
2 changes: 1 addition & 1 deletion tests/run-make/print-calling-conventions/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
-include ../tools.mk
include ../../run-make-fulldeps/tools.mk

all:
$(RUSTC) --print calling-conventions
2 changes: 1 addition & 1 deletion tests/run-make/raw-dylib-import-name-type/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# only-x86
# only-windows

-include ../../run-make-fulldeps/tools.mk
include ../../run-make-fulldeps/tools.mk

all:
$(RUSTC) --crate-type bin driver.rs -L "$(TMPDIR)"
Expand Down
2 changes: 1 addition & 1 deletion tests/run-make/rlib-format-packed-bundled-libs-2/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
-include ../../run-make-fulldeps/tools.mk
include ../../run-make-fulldeps/tools.mk

# ignore-cross-compile

Expand Down
2 changes: 1 addition & 1 deletion tests/run-make/rlib-format-packed-bundled-libs-3/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
-include ../../run-make-fulldeps/tools.mk
include ../../run-make-fulldeps/tools.mk

# ignore-cross-compile
# only-linux
Expand Down
2 changes: 1 addition & 1 deletion tests/run-make/track-pgo-dep-info/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# needs-profiler-support
# ignore-windows-gnu

-include ../../run-make-fulldeps/tools.mk
include ../../run-make-fulldeps/tools.mk

# FIXME(eddyb) provide `HOST_RUSTC` and `TARGET_RUSTC`
# instead of hardcoding them everywhere they're needed.
Expand Down