diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2014-02-07 16:04:57 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2014-02-07 16:04:57 -0800 |
| commit | 28b72cdae413b69695854b3eaebd052e0b0d7a89 (patch) | |
| tree | cf5c540e2175e59780a1096eba1337cfc2883d99 | |
| parent | c3ccaacc6c90fc678cbba9c3c0427f0a7dece75c (diff) | |
Set the LD_LIBRARY_PATH when running tests
This way when you disable rpaths you can still run `make check`
| -rw-r--r-- | mk/tests.mk | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mk/tests.mk b/mk/tests.mk index 426b4be156e..25c68d589bd 100644 --- a/mk/tests.mk +++ b/mk/tests.mk @@ -116,9 +116,11 @@ endif # Run the compiletest runner itself under valgrind ifdef CTEST_VALGRIND -CFG_RUN_CTEST_$(1)=$$(call CFG_RUN_TEST_$$(CFG_BUILD),$$(2),$$(3)) +CFG_RUN_CTEST_$(1)=$$(RPATH_VAR$$(1)_T_$$(3)_H_$$(3)) \ + $$(call CFG_RUN_TEST_$$(CFG_BUILD),$$(2),$$(3)) else -CFG_RUN_CTEST_$(1)=$$(call CFG_RUN_$$(CFG_BUILD),$$(TLIB$$(1)_T_$$(3)_H_$$(3)),$$(2)) +CFG_RUN_CTEST_$(1)=$$(RPATH_VAR$$(1)_T_$$(3)_H_$$(3)) \ + $$(call CFG_RUN_$$(CFG_BUILD),$$(TLIB$$(1)_T_$$(3)_H_$$(3)),$$(2)) endif endef |