diff options
Diffstat (limited to 'share/mk/bsd.test.mk')
| -rw-r--r-- | share/mk/bsd.test.mk | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/share/mk/bsd.test.mk b/share/mk/bsd.test.mk index b204a3c..af12418 100644 --- a/share/mk/bsd.test.mk +++ b/share/mk/bsd.test.mk @@ -39,11 +39,19 @@ DISTRIBUTION:= tests # Ordered list of directories to construct the PATH for the tests. TESTS_PATH+= ${DESTDIR}/bin ${DESTDIR}/sbin \ ${DESTDIR}/usr/bin ${DESTDIR}/usr/sbin +.if defined(.PARSEDIR) TESTS_ENV+= PATH=${TESTS_PATH:tW:C/ +/:/g} +.else +TESTS_ENV+= PATH=${TESTS_PATH:N :Q:S,\\ ,:,g} +.endif # Ordered list of directories to construct the LD_LIBRARY_PATH for the tests. TESTS_LD_LIBRARY_PATH+= ${DESTDIR}/lib ${DESTDIR}/usr/lib +.if defined(.PARSEDIR) TESTS_ENV+= LD_LIBRARY_PATH=${TESTS_LD_LIBRARY_PATH:tW:C/ +/:/g} +.else +TESTS_ENV+= LD_LIBRARY_PATH=${TESTS_LD_LIBRARY_PATH:N :Q:S,\\ ,:,g} +.endif # List of all tests being built. The various *.test.mk modules extend this # variable as needed. @@ -87,10 +95,6 @@ test: beforetest realtest test: aftertest .endif -.if !empty(SUBDIR) -.include <bsd.subdir.mk> -.endif - .if !empty(PROGS) || !empty(PROGS_CXX) || !empty(SCRIPTS) .include <bsd.progs.mk> .endif |
