Source: r-base Version: 2.13.1-1 Severity: wishlist Tags: patch Hi,
While looking into Bug#630129, I started to wonder why r-base runs tests during the install target instead of the build target. Changing it to use the build target seems to work fine. While at it, this patch adds support for DEB_BUILD_OPTIONS=nocheck. :) What do you think? --- debian/changelog | 11 ++++++++++- debian/rules | 9 ++++++--- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9f264249..13253e02 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +r-base (2.13.1-1.1) local; urgency=low + + * debian/rules: Run tests in build target, not the install target (since + they do not require root privileges). + * debian/rules: Do not run tests when DEB_BUILD_OPTIONS contains + "nocheck". + + -- Jonathan Nieder <[email protected]> Wed, 17 Aug 2011 16:57:27 -0500 + r-base (2.13.1-1) unstable; urgency=low * New upstream release @@ -2639,4 +2648,4 @@ r-base (0.61.0-1) unstable; urgency=low * Initial release -- Douglas Bates <[email protected]> Tue, 23 Dec 1997 10:01:21 -0600 - \ No newline at end of file + diff --git a/debian/rules b/debian/rules index ef84bb29..9f11a2dd 100755 --- a/debian/rules +++ b/debian/rules @@ -180,7 +180,10 @@ denmark: ## binary-arch and binary-indep, and those on their builds build: build-arch -build-arch: make-arch +build-arch: make-arch +ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) +build-arch: check +endif build-indep: make-indep @@ -346,7 +349,7 @@ clean: install: install-arch install-indep -install-arch: make-arch check install-arch-stamp +install-arch: build-arch install-arch-stamp install-arch-stamp: @echo "*** install-arch ***" dh_testdir @@ -596,7 +599,7 @@ binary-indep: build-indep install-indep dh_builddeb -i # Build architecture-dependent files here. -binary-arch: build-arch check install-arch +binary-arch: build-arch install-arch @echo "*** binary-arch ***" dh_testdir -a dh_testroot -a -- 1.7.6 -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected]
