Bug#942867: r-base: does not respect nocheck build profile in DEB_BUILD_OPTIONS

[Chris Lamb]

Source: r-base
Version: 3.6.1-6
Severity: normal
Tags: patch

Hi,

src:r-base does not appear to respect the "nocheck" profile in
DEB_BUILD_OPTIONS. Whilst there appears to be code that intends to do
exactly this, ie.:

    build-arch: make-arch
    ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
    build-arch: check
    endif

… AFAICT this does not work as we specify "check" directly in the
binary target:

    binary: make-stamp check binary-arch binary-indep

However, a patch is attached that drops the puts all of the "shall I
actually run the tests" predicates together which not only works (!)
it also is a bit clearer.

Discovered as part of faffing around with Reproducible Builds [0].

  [0] https://reproducible-builds.org/


Regards,

-- 
      ,''`.
     : :'  :     Chris Lamb
     `. `'`      la...@debian.org / chris-lamb.co.uk
       `-

diff --git a/debian/rules b/debian/rules
index 02eb1f7..bfae4db 100755
--- a/debian/rules
+++ b/debian/rules
@@ -219,10 +219,6 @@ denmark:
 build: build-arch build-indep
 
 build-arch: make-arch
-ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
-build-arch: check
-endif
-
 build-indep: make-indep
 
 configure: configure-stamp
@@ -385,6 +381,7 @@ make-stamp: make-arch make-indep
 check: make-stamp check-stamp
 check-stamp:
        @echo "*** check ***"
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 #ifneq ($(arch),arm)
 ## edd 11 Oct 2005  also disable on hppa
 ## edd 15 Apr 2008  call inside of xvfb-run for virtual x11, and switch to 
check-all
@@ -393,6 +390,7 @@ ifeq "$(findstring $(arch), hppa arm)" ""
 ifneq ($(buildos),kfreebsd)
        -xvfb-run make check-all
 endif
+endif
 endif
        touch check-stamp