diff options
| author | Richard Maw <richard.maw@codethink.co.uk> | 2012-04-25 11:45:39 +0000 |
|---|---|---|
| committer | Richard Maw <richard.maw@codethink.co.uk> | 2012-04-25 11:45:39 +0000 |
| commit | 7a0464c8c77fdfb8bc5f03ecc2bf26e035b7107c (patch) | |
| tree | 4da08ec952cc97062f10dc5d99e2636f85bcf4cf | |
| parent | dc126bf467208df7011e6928387f42ca938654cb (diff) | |
| download | morph-7a0464c8c77fdfb8bc5f03ecc2bf26e035b7107c.tar.gz | |
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
| -rwxr-xr-x | tests/build-system-cpan.script | 8 | ||||
| -rw-r--r-- | tests/build-system-cpan.stdout | 11 |
2 files changed, 6 insertions, 13 deletions
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 |