diff options
| author | Richard Maw <richard.maw@codethink.co.uk> | 2012-04-23 16:59:24 +0100 |
|---|---|---|
| committer | Richard Maw <richard.maw@codethink.co.uk> | 2012-04-23 17:01:41 +0100 |
| commit | fa56499ff7f69f122d38f08b832180cc4acf3ccb (patch) | |
| tree | a735eda5f38b9b066570cae55f695ce952598f59 /tests/build-system-cpan.script | |
| parent | aa204b6f53f7655c7583e2e1fcecf0f0f1bc8fa8 (diff) | |
| download | morph-fa56499ff7f69f122d38f08b832180cc4acf3ccb.tar.gz | |
cpan test: fix confusion over archname
archname may be in the version information twice if perl's
configure script was passed -Darchname, so exclude that result
Diffstat (limited to 'tests/build-system-cpan.script')
| -rwxr-xr-x | tests/build-system-cpan.script | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/tests/build-system-cpan.script b/tests/build-system-cpan.script index 59017d3f..31d69f1d 100755 --- a/tests/build-system-cpan.script +++ b/tests/build-system-cpan.script @@ -55,11 +55,8 @@ git commit --quiet -m 'convert hello into a perl cpan project' "$SRCDIR/scripts/test-morph" build --prefix=/ chunk-repo farrokh hello.morph -TEMPEXTRACT="$DATADIR/cpanextract" -mkdir -p "$TEMPEXTRACT" - PERLMAJOR=`perl -e 'print $^V' | sed 's|^v\([^\.]*\)\.[^\.]*\.[^\.]*$|\1|'` -ARCH=`perl -V | grep archname | sed 's|^.*archname=\(\S*\).*$|\1|'` +ARCH=`perl -V | grep 'archname' | grep -v -e '-Darchname' | sed 's|^.*archname=\(\S*\).*$|\1|'` for chunk in "$DATADIR/cache/"*.chunk.* do |