Re: bin/46015: atf rquotad test no longer runnable

[Manuel Bouyer <bouyer%antioche.eu.org@localhost>]

The following reply was made to PR bin/46015; it has been noted by GNATS.

From: Manuel Bouyer <bouyer%antioche.eu.org@localhost>
To: gnats-bugs%NetBSD.org@localhost
Cc: gnats-admin%NetBSD.org@localhost, netbsd-bugs%NetBSD.org@localhost, 
dholland%NetBSD.org@localhost
Subject: Re: bin/46015: atf rquotad test no longer runnable
Date: Mon, 13 Feb 2012 20:56:01 +0100

 --r5Pyd7+fXNt84Ff3
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline
 
 On Mon, Feb 13, 2012 at 04:24:11PM +0100, Manuel Bouyer wrote:
 > It's probably my fault; I forgot to update this test case when I split
 > non-quota parts out of ../ffs/quotas_common.sh. This should probably be:
 > TESTS_SH_SRC_${name}=  ../ffs/ffs_common.sh ../ffs/quotas_common.sh 
 > ${name}.sh
 > 
 > I'll look at fixing this this evening, unless someone beats me.
 
 The attached patch fixes it for me; I'll see with releng to commit it.
 
 -- 
 Manuel Bouyer <bouyer%antioche.eu.org@localhost>
      NetBSD: 26 ans d'experience feront toujours la difference
 --
 
 --r5Pyd7+fXNt84Ff3
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: attachment; filename=diff
 
 Index: Makefile
 ===================================================================
 RCS file: /cvsroot/src/tests/fs/nfs/Makefile,v
 retrieving revision 1.6
 diff -u -p -u -r1.6 Makefile
 --- Makefile   30 May 2011 14:41:26 -0000      1.6
 +++ Makefile   13 Feb 2012 19:54:59 -0000
 @@ -11,7 +11,7 @@ TESTS_C=     t_mountd
  
  .for name in t_rquotad
  TESTS_SH+=    ${name}
 -TESTS_SH_SRC_${name}= ../ffs/quotas_common.sh ${name}.sh
 +TESTS_SH_SRC_${name}= ../ffs/ffs_common.sh ../ffs/quotas_common.sh ${name}.sh
  .endfor
  
  VFSTESTDIR != cd ${.CURDIR}/../common && ${PRINTOBJDIR}
 Index: t_rquotad.sh
 ===================================================================
 RCS file: /cvsroot/src/tests/fs/nfs/t_rquotad.sh,v
 retrieving revision 1.1
 diff -u -p -u -r1.1 t_rquotad.sh
 --- t_rquotad.sh       12 Mar 2011 14:03:38 -0000      1.1
 +++ t_rquotad.sh       13 Feb 2012 19:54:59 -0000
 @@ -35,7 +35,7 @@ done
  
  get_nfs_quota()
  {
 -      create_with_quotas $*
 +      create_ffs $*
        local q=$3
        local expect
  
 @@ -138,5 +138,5 @@ get_nfs_quota()
        done
  
        unset LD_PRELOAD
 -      rump_shutdown
 +      rump_quota_shutdown
  }
 
 --r5Pyd7+fXNt84Ff3--