From 7a0464c8c77fdfb8bc5f03ecc2bf26e035b7107c Mon Sep 17 00:00:00 2001
From: Richard Maw <richard.maw@codethink.co.uk>
Date: Wed, 25 Apr 2012 11:45:39 +0000
Subject: build-system: cpan tests: simplify and correct

The normalisation code is no longer needed because it is configured
to always generate the right path now.

This also needs the output to be corrected
---
 tests/build-system-cpan.script |  8 +-------
 tests/build-system-cpan.stdout | 11 +++++------
 2 files changed, 6 insertions(+), 13 deletions(-)

(limited to 'tests')

diff --git a/tests/build-system-cpan.script b/tests/build-system-cpan.script
index 73e3f186..fe4f1c23 100755
--- a/tests/build-system-cpan.script
+++ b/tests/build-system-cpan.script
@@ -55,15 +55,9 @@ git commit --quiet -m 'convert hello into a perl cpan project'
 
 "$SRCDIR/scripts/test-morph" build --prefix=/ chunk-repo farrokh hello.morph
 
-PERLMAJOR=`perl -e 'print $^V' | sed 's|^v\([^\.]*\)\.[^\.]*\.[^\.]*$|\1|'`
-ARCH=`perl -V | grep 'archname' | grep -v -e '-Darchname' |
-          sed 's|^.*archname=\(\S*\).*$|\1|'`
-
 for chunk in "$DATADIR/cache/"*.chunk.*
 do
     echo "$chunk:" | sed 's/[^.]*//'
     tar -tf "$chunk" | LC_ALL=C sort |
-            sed -e '/^\.\/./s:^\./::' \
-                -e s/"$ARCH"/ARCH/ \
-                -e s/perl"$PERLMAJOR"/PERLDIR/
+            sed -e '/^\.\/./s:^\./::'
 done
diff --git a/tests/build-system-cpan.stdout b/tests/build-system-cpan.stdout
index e0c21af1..cb43da36 100644
--- a/tests/build-system-cpan.stdout
+++ b/tests/build-system-cpan.stdout
@@ -5,9 +5,8 @@ baserock/hello.meta
 bin/
 bin/hello
 lib/
-lib/PERLDIR/
-lib/PERLDIR/ARCH/
-lib/PERLDIR/ARCH/auto/
-lib/PERLDIR/ARCH/auto/hello.build/
-lib/PERLDIR/ARCH/auto/hello.build/.packlist
-lib/PERLDIR/ARCH/perllocal.pod
+lib/perl/
+lib/perl/auto/
+lib/perl/auto/hello.build/
+lib/perl/auto/hello.build/.packlist
+lib/perl/perllocal.pod
-- 
cgit v1.2.1