diff options
| author | Vytautas Astrauskas <vastrauskas@gmail.com> | 2021-07-23 12:43:54 +0200 |
|---|---|---|
| committer | Vytautas Astrauskas <vastrauskas@gmail.com> | 2021-07-23 12:43:54 +0200 |
| commit | d882b5132637c32396f42d09038d4e9dd3b68787 (patch) | |
| tree | e9f560d4a345851360a7eab10da015a3a120e323 | |
| parent | b913a4591a01424a2ff7fc47c8fd0e18ac0352e0 (diff) | |
| download | rust-d882b5132637c32396f42d09038d4e9dd3b68787.tar.gz rust-d882b5132637c32396f42d09038d4e9dd3b68787.zip | |
Move obtain-borrowck to run-make-fulldeps.
| -rw-r--r-- | src/test/run-make-fulldeps/obtain-borrowck/Makefile | 20 | ||||
| -rw-r--r-- | src/test/run-make-fulldeps/obtain-borrowck/driver.rs (renamed from src/test/run-make/obtain-borrowck/driver.rs) | 0 | ||||
| -rw-r--r-- | src/test/run-make-fulldeps/obtain-borrowck/output.stdout (renamed from src/test/run-make/obtain-borrowck/output.stdout) | 0 | ||||
| -rw-r--r-- | src/test/run-make-fulldeps/obtain-borrowck/test.rs (renamed from src/test/run-make/obtain-borrowck/test.rs) | 0 | ||||
| -rw-r--r-- | src/test/run-make/obtain-borrowck/Makefile | 25 |
5 files changed, 20 insertions, 25 deletions
diff --git a/src/test/run-make-fulldeps/obtain-borrowck/Makefile b/src/test/run-make-fulldeps/obtain-borrowck/Makefile new file mode 100644 index 00000000000..35314f2738b --- /dev/null +++ b/src/test/run-make-fulldeps/obtain-borrowck/Makefile @@ -0,0 +1,20 @@ +include ../tools.mk + +# This example shows how to implement a rustc driver that retrieves MIR bodies +# together with the borrow checker information. + +# How to run this +# $ ./x.py test src/test/run-make/obtain-borrowck + +DRIVER_BINARY := "$(TMPDIR)"/driver +SYSROOT := $(shell $(RUSTC) --print sysroot) + +all: + $(RUSTC) driver.rs -o "$(DRIVER_BINARY)" + $(TARGET_RPATH_ENV) "$(DRIVER_BINARY)" --sysroot $(SYSROOT) test.rs -o "$(TMPDIR)/driver_test" > "$(TMPDIR)"/output.stdout + +ifdef RUSTC_BLESS_TEST + cp "$(TMPDIR)"/output.stdout output.stdout +else + $(DIFF) output.stdout "$(TMPDIR)"/output.stdout +endif diff --git a/src/test/run-make/obtain-borrowck/driver.rs b/src/test/run-make-fulldeps/obtain-borrowck/driver.rs index 308df0b030c..308df0b030c 100644 --- a/src/test/run-make/obtain-borrowck/driver.rs +++ b/src/test/run-make-fulldeps/obtain-borrowck/driver.rs diff --git a/src/test/run-make/obtain-borrowck/output.stdout b/src/test/run-make-fulldeps/obtain-borrowck/output.stdout index e011622e6b2..e011622e6b2 100644 --- a/src/test/run-make/obtain-borrowck/output.stdout +++ b/src/test/run-make-fulldeps/obtain-borrowck/output.stdout diff --git a/src/test/run-make/obtain-borrowck/test.rs b/src/test/run-make-fulldeps/obtain-borrowck/test.rs index f7b4b41feaf..f7b4b41feaf 100644 --- a/src/test/run-make/obtain-borrowck/test.rs +++ b/src/test/run-make-fulldeps/obtain-borrowck/test.rs diff --git a/src/test/run-make/obtain-borrowck/Makefile b/src/test/run-make/obtain-borrowck/Makefile deleted file mode 100644 index ede3a9c42e7..00000000000 --- a/src/test/run-make/obtain-borrowck/Makefile +++ /dev/null @@ -1,25 +0,0 @@ --include ../../run-make-fulldeps/tools.mk - -# This example shows how to implement a rustc driver that retrieves MIR bodies -# together with the borrow checker information. - -# How to run this -# $ ./x.py test src/test/run-make/obtain-borrowck - -DRIVER_BINARY := "$(TMPDIR)"/driver -BUILD_STAGE := $(RUST_BUILD_STAGE:$(TARGET)=) -RUSTC_SRC_LIB_DEPS := $(BUILD_DIR)/$(TARGET)/$(BUILD_STAGE)rustc/release/deps/ -RUSTC_SRC_LIB := $(BUILD_DIR)/$(TARGET)/$(BUILD_STAGE)rustc/$(TARGET)/release/deps/ -SYSROOT := $(shell $(RUSTC) --print sysroot) -DRIVER_RPATH_ENV = \ - $(LD_LIB_PATH_ENVVAR)="${RUSTC_SRC_LIB}:$(HOST_RPATH_DIR)/rustlib/$(TARGET)/lib/:$($(LD_LIB_PATH_ENVVAR))" - -all: - $(RUSTC) -L $(RUSTC_SRC_LIB) -L $(RUSTC_SRC_LIB_DEPS) driver.rs -o "$(DRIVER_BINARY)" - $(DRIVER_RPATH_ENV) "$(DRIVER_BINARY)" --sysroot $(SYSROOT) test.rs -o "$(TMPDIR)/driver_test" > "$(TMPDIR)"/output.stdout - -ifdef RUSTC_BLESS_TEST - cp "$(TMPDIR)"/output.stdout output.stdout -else - $(DIFF) output.stdout "$(TMPDIR)"/output.stdout -endif |