diff options
| author | jlam <jlam@pkgsrc.org> | 2004-08-30 05:03:32 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2004-08-30 05:03:32 +0000 |
| commit | ee10720972c3af7448dd271c6bf5923992563c80 (patch) | |
| tree | a45d9504f850f8d7d7f6ea6f8cda134c5917ac5f | |
| parent | c335163e9d6891e8b0115f3e7caa8af9dffe5a0e (diff) | |
| download | pkgsrc-ee10720972c3af7448dd271c6bf5923992563c80.tar.gz | |
Check for the right output on a platform that has _USE_RPATH == no.
4 files changed, 36 insertions, 8 deletions
diff --git a/regress/buildlink-transform/tests/rpath-pkgdir-slashdot.mk b/regress/buildlink-transform/tests/rpath-pkgdir-slashdot.mk index 3c722d8f352..0baa0d8f323 100644 --- a/regress/buildlink-transform/tests/rpath-pkgdir-slashdot.mk +++ b/regress/buildlink-transform/tests/rpath-pkgdir-slashdot.mk @@ -1,8 +1,15 @@ -# $NetBSD: rpath-pkgdir-slashdot.mk,v 1.1.1.1 2004/08/27 21:34:58 jlam Exp $ +# $NetBSD: rpath-pkgdir-slashdot.mk,v 1.2 2004/08/30 05:03:32 jlam Exp $ .PHONY: rpath-pkgdir-slashdot do-regress: rpath-pkgdir-slashdot rpath-pkgdir-slashdot: @test="${COMPILER_RPATH_FLAG}${LOCALBASE}/lib/."; \ - expected="${COMPILER_RPATH_FLAG}${LOCALBASE}/lib"; \ + case "${_USE_RPATH}" in \ + [yY][eE][sS]) \ + expected="${COMPILER_RPATH_FLAG}${LOCALBASE}/lib"; \ + ;; \ + *) \ + expected=""; \ + ;; \ + esac; \ ${TEST_RESULT} diff --git a/regress/buildlink-transform/tests/rpath-pkgdir.mk b/regress/buildlink-transform/tests/rpath-pkgdir.mk index a95affe1a09..f2408a24710 100644 --- a/regress/buildlink-transform/tests/rpath-pkgdir.mk +++ b/regress/buildlink-transform/tests/rpath-pkgdir.mk @@ -1,8 +1,15 @@ -# $NetBSD: rpath-pkgdir.mk,v 1.1.1.1 2004/08/27 21:34:58 jlam Exp $ +# $NetBSD: rpath-pkgdir.mk,v 1.2 2004/08/30 05:03:32 jlam Exp $ .PHONY: rpath-pkgdir do-regress: rpath-pkgdir rpath-pkgdir: @test="${COMPILER_RPATH_FLAG}${LOCALBASE}/lib"; \ - expected="${COMPILER_RPATH_FLAG}${LOCALBASE}/lib"; \ + case "${_USE_RPATH}" in \ + [yY][eE][sS]) \ + expected="${COMPILER_RPATH_FLAG}${LOCALBASE}/lib"; \ + ;; \ + *) \ + expected=""; \ + ;; \ + esac; \ ${TEST_RESULT} diff --git a/regress/buildlink-transform/tests/rpath-pkgsubdir.mk b/regress/buildlink-transform/tests/rpath-pkgsubdir.mk index 27816863e3f..c2c1ad64256 100644 --- a/regress/buildlink-transform/tests/rpath-pkgsubdir.mk +++ b/regress/buildlink-transform/tests/rpath-pkgsubdir.mk @@ -1,8 +1,15 @@ -# $NetBSD: rpath-pkgsubdir.mk,v 1.1.1.1 2004/08/27 21:34:58 jlam Exp $ +# $NetBSD: rpath-pkgsubdir.mk,v 1.2 2004/08/30 05:03:32 jlam Exp $ .PHONY: rpath-pkgsubdir do-regress: rpath-pkgsubdir rpath-pkgsubdir: @test="${COMPILER_RPATH_FLAG}${LOCALBASE}/lib/mysql"; \ - expected="${COMPILER_RPATH_FLAG}${LOCALBASE}/lib/mysql"; \ + case "${_USE_RPATH}" in \ + [yY][eE][sS]) \ + expected="${COMPILER_RPATH_FLAG}${LOCALBASE}/lib/mysql"; \ + ;; \ + *) \ + expected=""; \ + ;; \ + esac; \ ${TEST_RESULT} diff --git a/regress/buildlink-transform/tests/rpath-usr-lib-subdir.mk b/regress/buildlink-transform/tests/rpath-usr-lib-subdir.mk index 6cdb4ac895d..3ab03452458 100644 --- a/regress/buildlink-transform/tests/rpath-usr-lib-subdir.mk +++ b/regress/buildlink-transform/tests/rpath-usr-lib-subdir.mk @@ -1,8 +1,15 @@ -# $NetBSD: rpath-usr-lib-subdir.mk,v 1.1.1.1 2004/08/27 21:34:58 jlam Exp $ +# $NetBSD: rpath-usr-lib-subdir.mk,v 1.2 2004/08/30 05:03:32 jlam Exp $ .PHONY: rpath-usr-lib-subdir do-regress: rpath-usr-lib-subdir rpath-usr-lib-subdir: @test="${COMPILER_RPATH_FLAG}/usr/lib/i18n"; \ - expected="${COMPILER_RPATH_FLAG}/usr/lib/i18n"; \ + case "${_USE_RPATH}" in \ + [yY][eE][sS]) \ + expected="${COMPILER_RPATH_FLAG}/usr/lib/i18n"; \ + ;; \ + *) \ + expected=""; \ + ;; \ + esac; \ ${TEST_RESULT} |