From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <zsh-workers-return-37228-mason-zsh=primenet.com.au@zsh.org>
Received: (qmail 15069 invoked by alias); 26 Nov 2015 20:22:45 -0000
Mailing-List: contact zsh-workers-help@zsh.org; run by ezmlm
Precedence: bulk
X-No-Archive: yes
List-Id: Zsh Workers List <zsh-workers.zsh.org>
List-Post: <mailto:zsh-workers@zsh.org>
List-Help: <mailto:zsh-workers-help@zsh.org>
X-Seq: 37228
Received: (qmail 202 invoked from network); 26 Nov 2015 20:22:42 -0000
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on f.primenet.com.au
X-Spam-Level: 
X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham
	autolearn_force=no version=3.4.0
Date: Thu, 26 Nov 2015 12:13:49 -0800
From: Danek Duvall <duvall@comfychair.org>
To: Bart Schaefer <schaefer@brasslantern.com>
Cc: zsh-workers@zsh.org
Subject: Re: Actually do test what I claimed to test
Message-ID: <20151126201349.GB12122@lorien.comfychair.org>
Mail-Followup-To: Danek Duvall <duvall@comfychair.org>,
	Bart Schaefer <schaefer@brasslantern.com>, zsh-workers@zsh.org
References: <151126092636.ZM12534@torch.brasslantern.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <151126092636.ZM12534@torch.brasslantern.com>
User-Agent: Mutt/1.5.20 (2010-04-22)

On Thu, Nov 26, 2015 at 09:26:36AM -0800, Bart Schaefer wrote:

> The test I added in 37208 wasn't doing what I intended.
> 
> Anyone see a portability problem with my use of "sed" here?

Doesn't work on Solaris unless you scrap the space between the "a" and the
backslash.  Then it seems to do the trick, and with GNU sed, too.

Danek

> 
> diff --git a/Test/V10private.ztst b/Test/V10private.ztst
> index f877455..d5bee5e 100644
> --- a/Test/V10private.ztst
> +++ b/Test/V10private.ztst
> @@ -6,12 +6,17 @@
>     ZTST_unimplemented="can't load the zsh/param/private module for testing"
>   fi
>  
> + # Do not use .tmp here, ztst.zsh will remove it too soon (see %cleanup)
> + mkdir private.TMP
> + sed '/^%prep/a \
> +  zmodload zsh/param/private' < $ZTST_srcdir/B02typeset.ztst > private.TMP/B02
> +
>  %test
>  
>   (zmodload -u zsh/param/private && zmodload zsh/param/private)
>  0:unload and reload the module without crashing
>  
> - $ZTST_exe +Z -f $ZTST_srcdir/ztst.zsh $ZTST_srcdir/B02typeset.ztst
> + ZTST_verbose=0 $ZTST_exe +Z -f $ZTST_srcdir/ztst.zsh private.TMP/B02
>  0:typeset still works with zsh/param/private module loaded
>  *>*
>  *>*
> @@ -270,3 +275,7 @@ F:note "typeset" rather than "private" in output from outer
>  
>   () { private -h SECONDS }
>  0:private parameter may hide a special parameter
> +
> +%clean
> +
> +  rm -r private.TMP