diff options
| author | bors <bors@rust-lang.org> | 2016-04-28 23:34:00 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2016-04-28 23:34:00 -0700 |
| commit | c0c08e2d77a4dab0414b08c4e9008113bf3fee67 (patch) | |
| tree | 3b7093d4ab4b5b41d21accd1a9e526629de41dab /src/test | |
| parent | 8da2bcac5db1e091b90cceb19d0496f0f7501c88 (diff) | |
| parent | 126e09e5e5f0eeb7098188126e57169c3a622563 (diff) | |
| download | rust-c0c08e2d77a4dab0414b08c4e9008113bf3fee67.tar.gz rust-c0c08e2d77a4dab0414b08c4e9008113bf3fee67.zip | |
Auto merge of #33093 - alexcrichton:rustbuild-rmake, r=nikomatsakis
test: Move run-make tests into compiletest Forcing them to be embedded in makefiles precludes being able to run them in rustbuild, and adding them to compiletest gives us a great way to leverage future enhancements to our "all encompassing test suite runner" as well as just moving more things into Rust. All tests are still Makefile-based in the sense that they rely on `make` being available to run them, but there's no longer any Makefile-trickery to run them and rustbuild can now run them out of the box as well.
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/run-make/issue-22131/Makefile | 2 | ||||
| -rw-r--r-- | src/test/run-make/tools.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/test/run-make/issue-22131/Makefile b/src/test/run-make/issue-22131/Makefile index ec1e282666a..1e8568626a6 100644 --- a/src/test/run-make/issue-22131/Makefile +++ b/src/test/run-make/issue-22131/Makefile @@ -2,6 +2,6 @@ all: foo.rs $(RUSTC) --cfg 'feature="bar"' --crate-type lib foo.rs - $(HOST_RPATH_ENV) $(RUSTDOC) --test --cfg 'feature="bar"' \ + $(HOST_RPATH_ENV) '$(RUSTDOC)' --test --cfg 'feature="bar"' \ -L $(TMPDIR) foo.rs |\ grep -q 'test foo_0 ... ok' diff --git a/src/test/run-make/tools.mk b/src/test/run-make/tools.mk index dab6511eb9d..38afa42a293 100644 --- a/src/test/run-make/tools.mk +++ b/src/test/run-make/tools.mk @@ -5,7 +5,7 @@ HOST_RPATH_ENV = \ TARGET_RPATH_ENV = \ $(LD_LIB_PATH_ENVVAR)="$(TMPDIR):$(TARGET_RPATH_DIR):$($(LD_LIB_PATH_ENVVAR))" -BARE_RUSTC := $(HOST_RPATH_ENV) $(RUSTC) +BARE_RUSTC := $(HOST_RPATH_ENV) '$(RUSTC)' RUSTC := $(BARE_RUSTC) --out-dir $(TMPDIR) -L $(TMPDIR) $(RUSTFLAGS) #CC := $(CC) -L $(TMPDIR) HTMLDOCCK := $(PYTHON) $(S)/src/etc/htmldocck.py |