diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/aux/common.sh | 68 | ||||
| -rw-r--r-- | tests/data/platconf_foo/platconf/x60/bar/poem | 6 | ||||
| -rw-r--r-- | tests/data/platconf_foo/platconf/x60/foo/poem | 36 | ||||
| -rw-r--r-- | tests/data/platconf_foo_1./platconf/x60/foo_1.*/poem | 36 | ||||
| -rw-r--r-- | tests/data/platconf_foo_1./platconf/x60/foo_1.1/poem | 6 | ||||
| -rw-r--r-- | tests/data/platconf_foo_1.0/platconf/x60/foo_1.0/poem | 36 | ||||
| -rw-r--r-- | tests/data/platconf_foo_1.0/platconf/x60/foo_2.0/poem | 6 | ||||
| -rwxr-xr-x | tests/exe/ob-installplatconf.sh | 39 | ||||
| -rwxr-xr-x | tests/exe/opkbuild.sh | 2 | ||||
| -rw-r--r-- | tests/local.mk | 6 |
10 files changed, 71 insertions, 170 deletions
diff --git a/tests/aux/common.sh b/tests/aux/common.sh index 9005325..3ea3740 100644 --- a/tests/aux/common.sh +++ b/tests/aux/common.sh @@ -110,3 +110,71 @@ cp -Rp "${TOP_SRCDIR}/tests/data/" "${TOP_BUILDDIR}/tests/data.build/" chmod -R u+w "${TOP_BUILDDIR}/tests/data.build/" # Automake makes files RO mkdir -p "${TOP_BUILDDIR}/tests/data.build/pkg/tmp/" cd "${TOP_BUILDDIR}/tests/data.build/pkg/tmp/" + +# And make platconf files. We can't just distribute these, because Automake's +# shell quoting is haphazard so it chokes in multiple ways on the "*" character +# in one of the directory names. +POEM_GOOD="$(cat <<-'EOF' + JABBERWOCKY + + 'Twas brillig, and the slithy toves + Did gyre and gimble in the wabe; + All mimsy were the borogoves, + And the mome raths outgrabe. + + 'Beware the Jabberwock, my son! + The jaws that bite, the claws that catch! + Beware the Jubjub bird, and shun + The frumious Bandersnatch!' + + He took his vorpal sword in hand: + Long time the manxome foe he sought-- + So rested he by the Tumtum tree, + And stood awhile in thought. + + And as in uffish thought he stood, + The Jabberwock, with eyes of flame, + Came whiffling through the tulgey wood, + And burbled as it came! + + One, two! One, two! And through and through + The vorpal blade went snicker-snack! + He left it dead, and with its head + He went galumphing back. + + 'And hast thou slain the Jabberwock? + Come to my arms, my beamish boy! + O frabjous day! Callooh! Callay!' + He chortled in his joy. + + 'Twas brillig, and the slithy toves + Did gyre and gimble in the wabe; + All mimsy were the borogoves, + And the mome raths outgrabe. + EOF + )" +POEM_BAD="$(cat <<-'EOF' + YKCOWREBBAJ + + sevot yhtils eht dna,gillirb sawT’ + ebaw eht ni elbmig dna eryg diD + ,sevogorob eht erew ysmim llA + .ebargtuo shtar emom eht dnA + EOF + )" +for datadir_pkgverdir in 'foo/foo' 'foo_1.0/foo_1.0' 'foo_1./foo_1.*'; do + IFS='/' read datadir pkgverdir <<-EOF + ${datadir_pkgverdir} + EOF + datadir="${TOP_BUILDDIR}/tests/data.build/platconf_${datadir}" + mkdir -p "${datadir}/platconf/x60/${pkgverdir}" + printf '%s' "${POEM_GOOD}" 1>"${datadir}/platconf/x60/${pkgverdir}/poem" +done +for datadir_pkgverdir in 'foo/bar' 'foo_1.0/foo_2.0' 'foo_1./foo_1.1'; do + IFS='/' read datadir pkgverdir <<-EOF + ${datadir_pkgverdir} + EOF + datadir="${TOP_BUILDDIR}/tests/data.build/platconf_${datadir}" + mkdir -p "${datadir}/platconf/x60/${pkgverdir}" + printf '%s' "${POEM_BAD}" 1>"${datadir}/platconf/x60/${pkgverdir}/poem" +done diff --git a/tests/data/platconf_foo/platconf/x60/bar/poem b/tests/data/platconf_foo/platconf/x60/bar/poem deleted file mode 100644 index 31953a1..0000000 --- a/tests/data/platconf_foo/platconf/x60/bar/poem +++ /dev/null @@ -1,6 +0,0 @@ - YKCOWREBBAJ - -sevot yhtils eht dna,gillirb sawT’ - ebaw eht ni elbmig dna eryg diD - ,sevogorob eht erew ysmim llA - .ebargtuo shtar emom eht dnA diff --git a/tests/data/platconf_foo/platconf/x60/foo/poem b/tests/data/platconf_foo/platconf/x60/foo/poem deleted file mode 100644 index 2566444..0000000 --- a/tests/data/platconf_foo/platconf/x60/foo/poem +++ /dev/null @@ -1,36 +0,0 @@ - JABBERWOCKY - -'Twas brillig, and the slithy toves - Did gyre and gimble in the wabe; -All mimsy were the borogoves, - And the mome raths outgrabe. - -'Beware the Jabberwock, my son! - The jaws that bite, the claws that catch! -Beware the Jubjub bird, and shun - The frumious Bandersnatch!' - -He took his vorpal sword in hand: - Long time the manxome foe he sought-- -So rested he by the Tumtum tree, - And stood awhile in thought. - -And as in uffish thought he stood, - The Jabberwock, with eyes of flame, -Came whiffling through the tulgey wood, - And burbled as it came! - -One, two! One, two! And through and through - The vorpal blade went snicker-snack! -He left it dead, and with its head - He went galumphing back. - -'And hast thou slain the Jabberwock? - Come to my arms, my beamish boy! -O frabjous day! Callooh! Callay!' - He chortled in his joy. - -'Twas brillig, and the slithy toves - Did gyre and gimble in the wabe; -All mimsy were the borogoves, - And the mome raths outgrabe. diff --git a/tests/data/platconf_foo_1./platconf/x60/foo_1.*/poem b/tests/data/platconf_foo_1./platconf/x60/foo_1.*/poem deleted file mode 100644 index 2566444..0000000 --- a/tests/data/platconf_foo_1./platconf/x60/foo_1.*/poem +++ /dev/null @@ -1,36 +0,0 @@ - JABBERWOCKY - -'Twas brillig, and the slithy toves - Did gyre and gimble in the wabe; -All mimsy were the borogoves, - And the mome raths outgrabe. - -'Beware the Jabberwock, my son! - The jaws that bite, the claws that catch! -Beware the Jubjub bird, and shun - The frumious Bandersnatch!' - -He took his vorpal sword in hand: - Long time the manxome foe he sought-- -So rested he by the Tumtum tree, - And stood awhile in thought. - -And as in uffish thought he stood, - The Jabberwock, with eyes of flame, -Came whiffling through the tulgey wood, - And burbled as it came! - -One, two! One, two! And through and through - The vorpal blade went snicker-snack! -He left it dead, and with its head - He went galumphing back. - -'And hast thou slain the Jabberwock? - Come to my arms, my beamish boy! -O frabjous day! Callooh! Callay!' - He chortled in his joy. - -'Twas brillig, and the slithy toves - Did gyre and gimble in the wabe; -All mimsy were the borogoves, - And the mome raths outgrabe. diff --git a/tests/data/platconf_foo_1./platconf/x60/foo_1.1/poem b/tests/data/platconf_foo_1./platconf/x60/foo_1.1/poem deleted file mode 100644 index 31953a1..0000000 --- a/tests/data/platconf_foo_1./platconf/x60/foo_1.1/poem +++ /dev/null @@ -1,6 +0,0 @@ - YKCOWREBBAJ - -sevot yhtils eht dna,gillirb sawT’ - ebaw eht ni elbmig dna eryg diD - ,sevogorob eht erew ysmim llA - .ebargtuo shtar emom eht dnA diff --git a/tests/data/platconf_foo_1.0/platconf/x60/foo_1.0/poem b/tests/data/platconf_foo_1.0/platconf/x60/foo_1.0/poem deleted file mode 100644 index 2566444..0000000 --- a/tests/data/platconf_foo_1.0/platconf/x60/foo_1.0/poem +++ /dev/null @@ -1,36 +0,0 @@ - JABBERWOCKY - -'Twas brillig, and the slithy toves - Did gyre and gimble in the wabe; -All mimsy were the borogoves, - And the mome raths outgrabe. - -'Beware the Jabberwock, my son! - The jaws that bite, the claws that catch! -Beware the Jubjub bird, and shun - The frumious Bandersnatch!' - -He took his vorpal sword in hand: - Long time the manxome foe he sought-- -So rested he by the Tumtum tree, - And stood awhile in thought. - -And as in uffish thought he stood, - The Jabberwock, with eyes of flame, -Came whiffling through the tulgey wood, - And burbled as it came! - -One, two! One, two! And through and through - The vorpal blade went snicker-snack! -He left it dead, and with its head - He went galumphing back. - -'And hast thou slain the Jabberwock? - Come to my arms, my beamish boy! -O frabjous day! Callooh! Callay!' - He chortled in his joy. - -'Twas brillig, and the slithy toves - Did gyre and gimble in the wabe; -All mimsy were the borogoves, - And the mome raths outgrabe. diff --git a/tests/data/platconf_foo_1.0/platconf/x60/foo_2.0/poem b/tests/data/platconf_foo_1.0/platconf/x60/foo_2.0/poem deleted file mode 100644 index 31953a1..0000000 --- a/tests/data/platconf_foo_1.0/platconf/x60/foo_2.0/poem +++ /dev/null @@ -1,6 +0,0 @@ - YKCOWREBBAJ - -sevot yhtils eht dna,gillirb sawT’ - ebaw eht ni elbmig dna eryg diD - ,sevogorob eht erew ysmim llA - .ebargtuo shtar emom eht dnA diff --git a/tests/exe/ob-installplatconf.sh b/tests/exe/ob-installplatconf.sh index 1279428..f2311c0 100755 --- a/tests/exe/ob-installplatconf.sh +++ b/tests/exe/ob-installplatconf.sh @@ -27,46 +27,11 @@ plan_ 6 export OB_TEST_DATADIR= for dir in 'foo' 'foo_1.0' 'foo_1.'; do - OB_TEST_DATADIR="${TOP_SRCDIR}/tests/data/platconf_${dir}" + OB_TEST_DATADIR=${TOP_BUILDDIR}/tests/data.build/platconf_${dir} rm -f 'poem' command_ok_ 'ob-installplatconf exit status' -- \ ob-installplatconf cmd_is 'correct file copied' cat 'poem' <<-EOF - JABBERWOCKY - - 'Twas brillig, and the slithy toves - Did gyre and gimble in the wabe; - All mimsy were the borogoves, - And the mome raths outgrabe. - - 'Beware the Jabberwock, my son! - The jaws that bite, the claws that catch! - Beware the Jubjub bird, and shun - The frumious Bandersnatch!' - - He took his vorpal sword in hand: - Long time the manxome foe he sought-- - So rested he by the Tumtum tree, - And stood awhile in thought. - - And as in uffish thought he stood, - The Jabberwock, with eyes of flame, - Came whiffling through the tulgey wood, - And burbled as it came! - - One, two! One, two! And through and through - The vorpal blade went snicker-snack! - He left it dead, and with its head - He went galumphing back. - - 'And hast thou slain the Jabberwock? - Come to my arms, my beamish boy! - O frabjous day! Callooh! Callay!' - He chortled in his joy. - - 'Twas brillig, and the slithy toves - Did gyre and gimble in the wabe; - All mimsy were the borogoves, - And the mome raths outgrabe. + ${POEM_GOOD} EOF done diff --git a/tests/exe/opkbuild.sh b/tests/exe/opkbuild.sh index 13dc154..47fdcf7 100755 --- a/tests/exe/opkbuild.sh +++ b/tests/exe/opkbuild.sh @@ -41,7 +41,7 @@ ls_inner() plan_ 12 -export OB_TEST_DATADIR="${TOP_SRCDIR}/tests/data/platconf_foo" +export OB_TEST_DATADIR="${TOP_BUILDDIR}/tests/data.build/platconf_foo" # Get out of and remove the work area. cd '../' diff --git a/tests/local.mk b/tests/local.mk index 236926f..a138d59 100644 --- a/tests/local.mk +++ b/tests/local.mk @@ -49,12 +49,6 @@ EXTRA_DIST += \ tests/data/pkg/patches/01_goodbye.patch \ tests/data/pkg/platconf \ tests/data/pkg/substvars \ - tests/data/platconf_foo/platconf/x60/bar/poem \ - tests/data/platconf_foo/platconf/x60/foo/poem \ - tests/data/platconf_foo_1./platconf/x60/foo_1.*/poem \ - tests/data/platconf_foo_1./platconf/x60/foo_1.1/poem \ - tests/data/platconf_foo_1.0/platconf/x60/foo_1.0/poem \ - tests/data/platconf_foo_1.0/platconf/x60/foo_2.0/poem \ tests/data/src/src/foo.sh distclean-local: |