diff options
| -rw-r--r-- | Makefile | 5 | ||||
| -rw-r--r-- | minicargo.mk | 7 |
2 files changed, 10 insertions, 2 deletions
@@ -222,7 +222,7 @@ endif local_tests: @$(MAKE) -C tools/testrunner @mkdir -p output$(OUTDIR_SUF)/local_tests - ./tools/bin/testrunner -o output$(OUTDIR_SUF)/local_tests samples/test + ./tools/bin/testrunner -o output$(OUTDIR_SUF)/local_tests -L output samples/test # # RUSTC TESTS @@ -238,7 +238,8 @@ RUST_TESTS: RUST_TESTS_run-pass RUST_TESTS_run-pass: @$(MAKE) -C tools/testrunner @mkdir -p output$(OUTDIR_SUF)/rust_tests/run-pass - ./tools/bin/testrunner -o output$(OUTDIR_SUF)/rust_tests/run-pass $(RUST_TESTS_DIR)run-pass --exceptions disabled_tests_run-pass.txt + make -f minicargo.mk output$(OUTDIR_SUF)/test/libtest.so + ./tools/bin/testrunner -L output$(OUTDIR_SUF)/test -o output$(OUTDIR_SUF)/rust_tests/run-pass $(RUST_TESTS_DIR)run-pass --exceptions disabled_tests_run-pass.txt output$(OUTDIR_SUF)/librust_test_helpers.a: output$(OUTDIR_SUF)/rust_test_helpers.o @mkdir -p $(dir $@) ar cur $@ $< diff --git a/minicargo.mk b/minicargo.mk index 65383635..f7476659 100644 --- a/minicargo.mk +++ b/minicargo.mk @@ -81,6 +81,13 @@ $(OUTDIR)libproc_macro.rlib: $(MRUSTC) $(MINICARGO) $(OUTDIR)libstd.rlib $(MINICARGO) lib/libproc_macro --output-dir $(OUTDIR) $(MINICARGO_FLAGS) test -e $@ +$(OUTDIR)test/libtest.so: $(MRUSTC) $(MINICARGO) + mkdir -p $(dir $@) + MINICARGO_DYLIB=1 $(MINICARGO) $(RUSTCSRC)src/libstd --script-overrides $(OVERRIDE_DIR) --output-dir $(dir $@) $(MINICARGO_FLAGS) + MINICARGO_DYLIB=1 $(MINICARGO) $(RUSTCSRC)src/libpanic_unwind --script-overrides $(OVERRIDE_DIR) --output-dir $(dir $@) $(MINICARGO_FLAGS) + MINICARGO_DYLIB=1 $(MINICARGO) $(RUSTCSRC)src/libtest --vendor-dir $(RUSTCSRC)src/vendor --output-dir $(dir $@) $(MINICARGO_FLAGS) + test -e $@ + RUSTC_ENV_VARS := CFG_COMPILER_HOST_TRIPLE=$(RUSTC_TARGET) RUSTC_ENV_VARS += LLVM_CONFIG=$(abspath $(LLVM_CONFIG)) RUSTC_ENV_VARS += CFG_RELEASE= |