diff options
author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2012-11-14 16:51:48 +0000 |
---|---|---|
committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2012-11-14 17:02:58 +0000 |
commit | 70564c6457b732e1dd35384971da5df3c5a1665b (patch) | |
tree | fec929625b46df3eca62f4f316bef90f6128c51a | |
parent | 4a2b2aa38b85971b72c925eea5ca18767c63cc50 (diff) | |
download | morph-70564c6457b732e1dd35384971da5df3c5a1665b.tar.gz |
Tidy up command tests
Be consistent about placement of test description, blank lines, etc.
85 files changed, 366 insertions, 285 deletions
diff --git a/tests.as-root/archless-system-fails.script b/tests.as-root/archless-system-fails.script index ef38c2e6..074ff46f 100755 --- a/tests.as-root/archless-system-fails.script +++ b/tests.as-root/archless-system-fails.script @@ -1,23 +1,23 @@ #!/bin/sh # -# If a system has multiple strata that have the same files in them, -# then this should be notified -# # Copyright (C) 2011, 2012 Codethink Limited -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License along # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +## Raise an error if system has no architecture defined. + set -eu cache="$DATADIR/cache/artifacts" diff --git a/tests.as-root/build-with-external-strata.script b/tests.as-root/build-with-external-strata.script index 6bd14c10..c3d84ec6 100755 --- a/tests.as-root/build-with-external-strata.script +++ b/tests.as-root/build-with-external-strata.script @@ -14,7 +14,8 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# "morph build" with strata outside the branch root repository. + +## "morph build" with strata outside the branch root repository. set -eu diff --git a/tests.as-root/building-a-system-branch-multiple-times-doesnt-generate-new-artifacts.script b/tests.as-root/building-a-system-branch-multiple-times-doesnt-generate-new-artifacts.script index bf8ecf71..6c8f5c28 100755 --- a/tests.as-root/building-a-system-branch-multiple-times-doesnt-generate-new-artifacts.script +++ b/tests.as-root/building-a-system-branch-multiple-times-doesnt-generate-new-artifacts.script @@ -14,8 +14,8 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# Make sure "morph build" works anywhere in a workspace or system branch -# and produces the same results every time. +## Make sure "morph build" works anywhere in a workspace or system branch +## and produces the same results every time. set -eu diff --git a/tests.as-root/building-a-system-branch-picks-up-uncommitted-changes.script b/tests.as-root/building-a-system-branch-picks-up-uncommitted-changes.script index 65c25c73..73682736 100755 --- a/tests.as-root/building-a-system-branch-picks-up-uncommitted-changes.script +++ b/tests.as-root/building-a-system-branch-picks-up-uncommitted-changes.script @@ -14,8 +14,9 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# Make sure "morph build" works anywhere in a workspace or system branch -# and produces the same results every time. + +## Make sure "morph build" works anywhere in a workspace or system branch +## and produces the same results every time. set -eu diff --git a/tests.as-root/building-a-system-branch-works-anywhere.script b/tests.as-root/building-a-system-branch-works-anywhere.script index e79fa167..11fc6850 100755 --- a/tests.as-root/building-a-system-branch-works-anywhere.script +++ b/tests.as-root/building-a-system-branch-works-anywhere.script @@ -14,8 +14,9 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# Make sure "morph build" works anywhere in a workspace or system branch -# and produces the same results every time. + +## Make sure "morph build" works anywhere in a workspace or system branch +## and produces the same results every time. set -eu diff --git a/tests.as-root/building-creates-correct-temporary-refs.script b/tests.as-root/building-creates-correct-temporary-refs.script index 8c6f8807..be067f71 100755 --- a/tests.as-root/building-creates-correct-temporary-refs.script +++ b/tests.as-root/building-creates-correct-temporary-refs.script @@ -14,8 +14,9 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# Make sure "morph build" works anywhere in a workspace or system branch -# and produces the same results every time. + +## Make sure "morph build" works anywhere in a workspace or system branch +## and produces the same results every time. set -eu diff --git a/tests.as-root/disk-builds-rootfs-and-kernel.script b/tests.as-root/disk-builds-rootfs-and-kernel.script index 77283840..3c1b903c 100755 --- a/tests.as-root/disk-builds-rootfs-and-kernel.script +++ b/tests.as-root/disk-builds-rootfs-and-kernel.script @@ -1,22 +1,23 @@ #!/bin/bash # -# A system kind of 'disk' should create the disk image, plus a kernel file. -# # Copyright (C) 2012 Codethink Limited -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License along # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +## A system kind of 'disk' should create the disk image, plus a kernel file. + set -eu . "$SRCDIR/tests.as-root/lib" diff --git a/tests.as-root/make-patch.script b/tests.as-root/make-patch.script index 59b42adf..43b0b26a 100755 --- a/tests.as-root/make-patch.script +++ b/tests.as-root/make-patch.script @@ -1,22 +1,23 @@ #!/bin/bash # -# Test making a patch between two different system images -# # Copyright (C) 2012 Codethink Limited -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License along # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +## Test making a patch between two different system images. + set -eu . "$SRCDIR/tests.as-root/lib" diff --git a/tests.as-root/rootfs-tarball-builds-rootfs-and-kernel.script b/tests.as-root/rootfs-tarball-builds-rootfs-and-kernel.script index 95e7a504..f1aa674a 100755 --- a/tests.as-root/rootfs-tarball-builds-rootfs-and-kernel.script +++ b/tests.as-root/rootfs-tarball-builds-rootfs-and-kernel.script @@ -1,23 +1,24 @@ #!/bin/sh # -# A system-kind of rootfs-tarball should build both kernel image and -# a tarball with the root filesystem. -# # Copyright (C) 2011, 2012 Codethink Limited -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License along # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +# A system-kind of rootfs-tarball should build both kernel image and +# a tarball with the root filesystem. + set -eu . "$SRCDIR/scripts/python-check" diff --git a/tests.as-root/syslinux-disk-builds-rootfs-and-kernel.script b/tests.as-root/syslinux-disk-builds-rootfs-and-kernel.script index 463f2a1d..4a55cd5b 100755 --- a/tests.as-root/syslinux-disk-builds-rootfs-and-kernel.script +++ b/tests.as-root/syslinux-disk-builds-rootfs-and-kernel.script @@ -1,23 +1,24 @@ #!/bin/bash # -# A system kind of syslinux-disk should create the disk image, plus a kernel -# file. -# # Copyright (C) 2011, 2012 Codethink Limited -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License along # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +# A system kind of syslinux-disk should create the disk image, plus a kernel +# file. + set -eu . "$SRCDIR/tests.as-root/lib" diff --git a/tests.as-root/syslinux-fails-if-no-mbr-found.script b/tests.as-root/syslinux-fails-if-no-mbr-found.script index 9357cfc9..fbf675dc 100755 --- a/tests.as-root/syslinux-fails-if-no-mbr-found.script +++ b/tests.as-root/syslinux-fails-if-no-mbr-found.script @@ -1,23 +1,24 @@ #!/bin/sh # -# A system kind of syslinux-disk should create the disk image, plus a kernel -# file. -# # Copyright (C) 2011, 2012 Codethink Limited -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License along # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +# A system kind of syslinux-disk should create the disk image, plus a kernel +# file. + set -eu # We only support x86 systems with syslinux-disk. diff --git a/tests.as-root/system-overlap.script b/tests.as-root/system-overlap.script index 61b89f27..cc308536 100755 --- a/tests.as-root/system-overlap.script +++ b/tests.as-root/system-overlap.script @@ -1,23 +1,24 @@ #!/bin/sh # -# If a system has multiple strata that have the same files in them, -# then this should be notified -# # Copyright (C) 2011, 2012 Codethink Limited -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License along # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +# If a system has multiple strata that have the same files in them, +# then this should be noted. + set -eu cache="$DATADIR/cache/artifacts" diff --git a/tests.as-root/tarball-image-is-sensible.script b/tests.as-root/tarball-image-is-sensible.script index 035a13c7..46510252 100755 --- a/tests.as-root/tarball-image-is-sensible.script +++ b/tests.as-root/tarball-image-is-sensible.script @@ -1,23 +1,24 @@ #!/bin/sh # -# A system kind of 'rootfs-tarball' should create a tarball containing -# all the required files -# # Copyright (C) 2012 Codethink Limited -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License along # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +# A system kind of 'rootfs-tarball' should create a tarball containing +# all the required files. + set -eu . "$SRCDIR/scripts/python-check" diff --git a/tests.branching/ambiguous-refs.script b/tests.branching/ambiguous-refs.script index 3b2ec5e8..a93c4b66 100755 --- a/tests.branching/ambiguous-refs.script +++ b/tests.branching/ambiguous-refs.script @@ -1,4 +1,5 @@ #!/bin/sh +# # Copyright (C) 2012 Codethink Limited # # This program is free software; you can redistribute it and/or modify @@ -15,8 +16,8 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# 'git show-ref master' sorts its output alphabetically, so we can't rely on -# it to resolve 'master': we might get 'alpha/master' instead. +## 'git show-ref master' sorts its output alphabetically, so we can't rely on +## it to resolve 'master': we might get 'alpha/master' instead. set -eu diff --git a/tests.branching/branch-cleans-up-on-failure.script b/tests.branching/branch-cleans-up-on-failure.script index 5e358fb9..55666137 100755 --- a/tests.branching/branch-cleans-up-on-failure.script +++ b/tests.branching/branch-cleans-up-on-failure.script @@ -1,4 +1,5 @@ #!/bin/sh +# # Copyright (C) 2012 Codethink Limited # # This program is free software; you can redistribute it and/or modify @@ -14,8 +15,9 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# If a command fails, the state of the workspace should be as if the command -# was never run + +## If a command fails, the state of the workspace should be as if the command +## was never run set -eu diff --git a/tests.branching/branch-creates-new-system-branch-not-from-master.script b/tests.branching/branch-creates-new-system-branch-not-from-master.script index 2ddc053a..72e21740 100755 --- a/tests.branching/branch-creates-new-system-branch-not-from-master.script +++ b/tests.branching/branch-creates-new-system-branch-not-from-master.script @@ -1,4 +1,5 @@ #!/bin/sh +# # Copyright (C) 2012 Codethink Limited # # This program is free software; you can redistribute it and/or modify @@ -14,7 +15,8 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# Make sure "morph branch" creates a new system branch. + +## Make sure "morph branch" creates a new system branch. set -eu diff --git a/tests.branching/branch-creates-new-system-branch.script b/tests.branching/branch-creates-new-system-branch.script index 35b50f7c..c2d7f640 100755 --- a/tests.branching/branch-creates-new-system-branch.script +++ b/tests.branching/branch-creates-new-system-branch.script @@ -1,4 +1,5 @@ #!/bin/sh +# # Copyright (C) 2012 Codethink Limited # # This program is free software; you can redistribute it and/or modify @@ -14,7 +15,8 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# Make sure "morph branch" creates a new system branch. + +## Make sure "morph branch" creates a new system branch. set -eu diff --git a/tests.branching/branch-fails-if-branch-exists.script b/tests.branching/branch-fails-if-branch-exists.script index 1ae92d30..8a7da8ab 100755 --- a/tests.branching/branch-fails-if-branch-exists.script +++ b/tests.branching/branch-fails-if-branch-exists.script @@ -1,4 +1,5 @@ #!/bin/sh +# # Copyright (C) 2012 Codethink Limited # # This program is free software; you can redistribute it and/or modify @@ -14,8 +15,9 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# Make sure "morph branch" fails if the system branch already exists in the -# branch root (morphologies repo). + +## Make sure "morph branch" fails if the system branch already exists in the +## branch root (morphologies repo). set -eu diff --git a/tests.branching/branch-when-branchdir-exists-locally.script b/tests.branching/branch-when-branchdir-exists-locally.script index 318f1b37..66a116be 100755 --- a/tests.branching/branch-when-branchdir-exists-locally.script +++ b/tests.branching/branch-when-branchdir-exists-locally.script @@ -1,4 +1,5 @@ #!/bin/sh +# # Copyright (C) 2012 Codethink Limited # # This program is free software; you can redistribute it and/or modify @@ -14,8 +15,9 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# Make sure "morph branch" fails when the system branch directory already -# exists. + +## Make sure "morph branch" fails when the system branch directory already +## exists. set -eu diff --git a/tests.branching/branch-works-anywhere.script b/tests.branching/branch-works-anywhere.script index 5198d7f4..ee8f5bfa 100755 --- a/tests.branching/branch-works-anywhere.script +++ b/tests.branching/branch-works-anywhere.script @@ -1,4 +1,5 @@ #!/bin/bash +# # Copyright (C) 2012 Codethink Limited # # This program is free software; you can redistribute it and/or modify @@ -14,7 +15,8 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# Make sure "morph branch" works anywhere in a workspace or system branch. + +## Make sure "morph branch" works anywhere in a workspace or system branch. set -eu diff --git a/tests.branching/checkout-cleans-up-on-failure.script b/tests.branching/checkout-cleans-up-on-failure.script index fe80770f..a0b0411b 100755 --- a/tests.branching/checkout-cleans-up-on-failure.script +++ b/tests.branching/checkout-cleans-up-on-failure.script @@ -1,4 +1,5 @@ #!/bin/sh +# # Copyright (C) 2012 Codethink Limited # # This program is free software; you can redistribute it and/or modify @@ -14,8 +15,9 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# If a command fails, the state of the workspace should be as if the command -# was never run + +## If a command fails, the state of the workspace should be as if the command +## was never run set -eu diff --git a/tests.branching/checkout-existing-branch.script b/tests.branching/checkout-existing-branch.script index 310b9f42..653fffb5 100755 --- a/tests.branching/checkout-existing-branch.script +++ b/tests.branching/checkout-existing-branch.script @@ -1,4 +1,5 @@ #!/bin/sh +# # Copyright (C) 2012 Codethink Limited # # This program is free software; you can redistribute it and/or modify @@ -15,12 +16,10 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# Verify that "morph checkout test:morphs master" works. - +## Verify that "morph checkout test:morphs master" works. set -eu - cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" init "$SRCDIR/scripts/test-morph" checkout test:morphs master diff --git a/tests.branching/checkout-non-aliased-repos.script b/tests.branching/checkout-non-aliased-repos.script index b98add2c..b52f6675 100755 --- a/tests.branching/checkout-non-aliased-repos.script +++ b/tests.branching/checkout-non-aliased-repos.script @@ -1,4 +1,5 @@ #!/bin/bash +# # Copyright (C) 2012 Codethink Limited # # This program is free software; you can redistribute it and/or modify @@ -15,15 +16,13 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# Verify that "morph checkout" works with repos that are not aliased. -# This test in particular verifies that URI schemes are stripped off -# and that the .git suffix is only removed at the end if it is actually -# present. - +## Verify that "morph checkout" works with repos that are not aliased. +## This test in particular verifies that URI schemes are stripped off +## and that the .git suffix is only removed at the end if it is actually +## present. set -eu - REPO_WITH_SUFFIX="file://$DATADIR/morphs.git" REPO_WITHOUT_SUFFIX="file://$DATADIR/morphs" diff --git a/tests.branching/checkout-works-anywhere.script b/tests.branching/checkout-works-anywhere.script index c7d046e4..02deb4d7 100755 --- a/tests.branching/checkout-works-anywhere.script +++ b/tests.branching/checkout-works-anywhere.script @@ -1,4 +1,5 @@ #!/bin/bash +# # Copyright (C) 2012 Codethink Limited # # This program is free software; you can redistribute it and/or modify @@ -14,7 +15,8 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# Make sure "morph checkout" works anywhere in a workspace or system branch. + +## Make sure "morph checkout" works anywhere in a workspace or system branch. set -eu diff --git a/tests.branching/edit-checkouts-existing-chunk.script b/tests.branching/edit-checkouts-existing-chunk.script index 814b128f..a10a72d1 100755 --- a/tests.branching/edit-checkouts-existing-chunk.script +++ b/tests.branching/edit-checkouts-existing-chunk.script @@ -1,4 +1,5 @@ #!/bin/sh +# # Copyright (C) 2012 Codethink Limited # # This program is free software; you can redistribute it and/or modify @@ -15,8 +16,7 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# Verify that "morph edit" clones a chunk repository into a system branch. - +## Verify that "morph edit" clones a chunk repository into a system branch. set -eu diff --git a/tests.branching/edit-clones-chunk.script b/tests.branching/edit-clones-chunk.script index 27440816..1b6b8a04 100755 --- a/tests.branching/edit-clones-chunk.script +++ b/tests.branching/edit-clones-chunk.script @@ -1,4 +1,5 @@ #!/bin/sh +# # Copyright (C) 2012 Codethink Limited # # This program is free software; you can redistribute it and/or modify @@ -15,8 +16,7 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# Verify that "morph edit" clones a chunk repository into a system branch. - +## Verify that "morph edit" clones a chunk repository into a system branch. set -eu diff --git a/tests.branching/edit-handles-submodules.script b/tests.branching/edit-handles-submodules.script index bbe86c1f..d164facc 100755 --- a/tests.branching/edit-handles-submodules.script +++ b/tests.branching/edit-handles-submodules.script @@ -1,4 +1,5 @@ #!/bin/sh +# # Copyright (C) 2012 Codethink Limited # # This program is free software; you can redistribute it and/or modify @@ -14,8 +15,9 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# 'morph edit' should set up git URL rewriting correctly so that submodule -# commands function as usual, despite our prefixing and mirroring. + +## 'morph edit' should set up git URL rewriting correctly so that submodule +## commands function as usual, despite our prefixing and mirroring. set -eu diff --git a/tests.branching/edit-updates-stratum.script b/tests.branching/edit-updates-stratum.script index 8b6af1d1..c2716cab 100755 --- a/tests.branching/edit-updates-stratum.script +++ b/tests.branching/edit-updates-stratum.script @@ -1,4 +1,5 @@ #!/bin/sh +# # Copyright (C) 2012 Codethink Limited # # This program is free software; you can redistribute it and/or modify @@ -15,8 +16,7 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# Verify that "morph edit" clones a chunk repository into a system branch. - +## Verify that "morph edit" clones a chunk repository into a system branch. set -eu diff --git a/tests.branching/edit-uses-ref-from-stratum.script b/tests.branching/edit-uses-ref-from-stratum.script index f62dd73e..b933996b 100755 --- a/tests.branching/edit-uses-ref-from-stratum.script +++ b/tests.branching/edit-uses-ref-from-stratum.script @@ -1,4 +1,5 @@ #!/bin/sh +# # Copyright (C) 2012 Codethink Limited # # This program is free software; you can redistribute it and/or modify @@ -15,8 +16,7 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# Verify that "morph edit" clones a chunk repository into a system branch. - +## Verify that "morph edit" clones a chunk repository into a system branch. set -eu diff --git a/tests.branching/edit-works-after-branch-root-was-renamed.script b/tests.branching/edit-works-after-branch-root-was-renamed.script index b6eaa729..5e298d93 100755 --- a/tests.branching/edit-works-after-branch-root-was-renamed.script +++ b/tests.branching/edit-works-after-branch-root-was-renamed.script @@ -1,4 +1,5 @@ #!/bin/sh +# # Copyright (C) 2012 Codethink Limited # # This program is free software; you can redistribute it and/or modify @@ -14,9 +15,10 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# Verify that the branch root repository created by "morph branch" or -# "morph checkout" can be renamed and "morph edit" still finds the -# branch root repo and works. + +## Verify that the branch root repository created by "morph branch" or +## "morph checkout" can be renamed and "morph edit" still finds the +## branch root repo and works. set -eu diff --git a/tests.branching/foreach-handles-command-failure.script b/tests.branching/foreach-handles-command-failure.script index 00d27659..eea381c8 100755 --- a/tests.branching/foreach-handles-command-failure.script +++ b/tests.branching/foreach-handles-command-failure.script @@ -1,4 +1,5 @@ #!/bin/sh +# # Copyright (C) 2012 Codethink Limited # # This program is free software; you can redistribute it and/or modify @@ -15,8 +16,7 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# Verify that "morph foreach" deals with failure in a grown-up way - +## Verify that "morph foreach" deals with failure in a grown-up way set -eu diff --git a/tests.branching/foreach-handles-full-urls.script b/tests.branching/foreach-handles-full-urls.script index cfe68704..6e0b14ec 100755 --- a/tests.branching/foreach-handles-full-urls.script +++ b/tests.branching/foreach-handles-full-urls.script @@ -1,4 +1,5 @@ #!/bin/sh +# # Copyright (C) 2012 Codethink Limited # # This program is free software; you can redistribute it and/or modify @@ -15,7 +16,7 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# morph foreach: should not break if we used a full URL for a repo +## morph foreach: should not break if we used a full URL for a repo set -eu diff --git a/tests.branching/init-cwd.script b/tests.branching/init-cwd.script index 2d14586c..10dd0cc7 100755 --- a/tests.branching/init-cwd.script +++ b/tests.branching/init-cwd.script @@ -1,4 +1,5 @@ #!/bin/sh +# # Copyright (C) 2012 Codethink Limited # # This program is free software; you can redistribute it and/or modify @@ -15,9 +16,9 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -set -eu +## Test that "morph init" works for the current working directory. -# Test that "morph init" works for the current working directory. +set -eu cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" init . diff --git a/tests.branching/init-default.script b/tests.branching/init-default.script index de4627e7..da67828f 100755 --- a/tests.branching/init-default.script +++ b/tests.branching/init-default.script @@ -1,4 +1,5 @@ #!/bin/sh +# # Copyright (C) 2012 Codethink Limited # # This program is free software; you can redistribute it and/or modify @@ -15,9 +16,9 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -set -eu +## Test that "morph init" works without an explicit argument. -# Test that "morph init" works without an explicit argument. +set -eu cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" init diff --git a/tests.branching/init-existing.script b/tests.branching/init-existing.script index e713b9df..506e94bb 100755 --- a/tests.branching/init-existing.script +++ b/tests.branching/init-existing.script @@ -1,4 +1,5 @@ #!/bin/sh +# # Copyright (C) 2012 Codethink Limited # # This program is free software; you can redistribute it and/or modify @@ -15,10 +16,10 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -set -eu +## Test that "morph init" works when given the name of an existing, +## empty directory. -# Test that "morph init" works when given the name of an existing, -# empty directory. +set -eu "$SRCDIR/scripts/test-morph" init "$DATADIR/workspace" "$SRCDIR/scripts/list-tree" "$DATADIR/workspace" diff --git a/tests.branching/init-newdir.script b/tests.branching/init-newdir.script index 5e79ce87..1f505d92 100755 --- a/tests.branching/init-newdir.script +++ b/tests.branching/init-newdir.script @@ -1,4 +1,5 @@ #!/bin/sh +# # Copyright (C) 2012 Codethink Limited # # This program is free software; you can redistribute it and/or modify @@ -15,10 +16,10 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -set -eu +## Test that "morph init" works if given a directory that +## does not exist yet. -# Test that "morph init" works if given a directory that -# does not exist yet. +set -eu "$SRCDIR/scripts/test-morph" init "$DATADIR/foo" "$SRCDIR/scripts/list-tree" "$DATADIR/foo" diff --git a/tests.branching/init-nonempty.script b/tests.branching/init-nonempty.script index 959da028..c5c1947c 100755 --- a/tests.branching/init-nonempty.script +++ b/tests.branching/init-nonempty.script @@ -1,4 +1,5 @@ #!/bin/sh +# # Copyright (C) 2012 Codethink Limited # # This program is free software; you can redistribute it and/or modify @@ -15,10 +16,10 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -set -eu +## Test that "morph init" fails when given the name of an existing, +## non-empty directory. -# Test that "morph init" fails when given the name of an existing, -# non-empty directory. +set -eu touch "$DATADIR/workspace/foo" "$SRCDIR/scripts/test-morph" init "$DATADIR/workspace" diff --git a/tests.branching/morph-repository-stored-in-cloned-repositories.script b/tests.branching/morph-repository-stored-in-cloned-repositories.script index 68edbad6..c2dc8690 100755 --- a/tests.branching/morph-repository-stored-in-cloned-repositories.script +++ b/tests.branching/morph-repository-stored-in-cloned-repositories.script @@ -1,4 +1,5 @@ #!/bin/sh +# # Copyright (C) 2012 Codethink Limited # # This program is free software; you can redistribute it and/or modify @@ -14,10 +15,11 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# Verify that morph branch/checkout/edit create repositories that have -# a "git config morph.repository" option set so that we can -# identify these repositories later even when the user has renamed or -# moved their local directories. + +## Verify that morph branch/checkout/edit create repositories that have +## a "git config morph.repository" option set so that we can +## identify these repositories later even when the user has renamed or +## moved their local directories. set -eu diff --git a/tests.branching/petrify-no-double-petrify.script b/tests.branching/petrify-no-double-petrify.script index 1b5289c4..25c977b6 100755 --- a/tests.branching/petrify-no-double-petrify.script +++ b/tests.branching/petrify-no-double-petrify.script @@ -1,4 +1,5 @@ #!/bin/sh +# # Copyright (C) 2012 Codethink Limited # # This program is free software; you can redistribute it and/or modify @@ -15,12 +16,11 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# It should be impossible to lose the original refs, or we risk making -# unpetrify impossible. +## It should be impossible to lose the original refs, or we risk making +## unpetrify impossible. set -eu - # Disable test on versions of Python before 2.7. . "$SRCDIR/scripts/python-check" diff --git a/tests.branching/petrify.script b/tests.branching/petrify.script index 0fb4a4c4..6b6581d3 100755 --- a/tests.branching/petrify.script +++ b/tests.branching/petrify.script @@ -1,4 +1,5 @@ #!/bin/sh +# # Copyright (C) 2012 Codethink Limited # # This program is free software; you can redistribute it and/or modify @@ -15,13 +16,11 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# Verify "morph petrify", and ensure it doesn't petrify chunks that have -# already been edited. - +## Verify "morph petrify", and ensure it doesn't petrify chunks that have +## already been edited. set -eu - # Disable test on versions of Python before 2.7. . "$SRCDIR/scripts/python-check" diff --git a/tests.branching/show-branch-root-in-branched-branch.script b/tests.branching/show-branch-root-in-branched-branch.script index c1798d78..4598d6a9 100755 --- a/tests.branching/show-branch-root-in-branched-branch.script +++ b/tests.branching/show-branch-root-in-branched-branch.script @@ -1,4 +1,5 @@ #!/bin/sh +# # Copyright (C) 2012 Codethink Limited # # This program is free software; you can redistribute it and/or modify @@ -15,9 +16,8 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# Check that 'morph show-branch-root' works when being run in a -# local system branch created using 'morph branch ...'. - +## Check that 'morph show-branch-root' works when being run in a +## local system branch created using 'morph branch ...'. set -eu diff --git a/tests.branching/show-branch-root-in-checked-out-branch.script b/tests.branching/show-branch-root-in-checked-out-branch.script index dfc08edb..97f892b9 100755 --- a/tests.branching/show-branch-root-in-checked-out-branch.script +++ b/tests.branching/show-branch-root-in-checked-out-branch.script @@ -1,4 +1,5 @@ #!/bin/sh +# # Copyright (C) 2012 Codethink Limited # # This program is free software; you can redistribute it and/or modify @@ -15,9 +16,8 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# Check that 'morph show-branch-root' works when being run in a -# local system branch created using 'morph checkout ...'. - +## Check that 'morph show-branch-root' works when being run in a +## local system branch created using 'morph checkout ...'. set -eu diff --git a/tests.branching/show-branch-root-with-repo-url.script b/tests.branching/show-branch-root-with-repo-url.script index 1470e0a6..5480c3ef 100755 --- a/tests.branching/show-branch-root-with-repo-url.script +++ b/tests.branching/show-branch-root-with-repo-url.script @@ -1,4 +1,5 @@ #!/bin/sh +# # Copyright (C) 2012 Codethink Limited # # This program is free software; you can redistribute it and/or modify @@ -15,9 +16,8 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# Check that 'morph show-branch-root' works when being run in a -# local system branch created from a full repository URL. - +## Check that 'morph show-branch-root' works when being run in a +## local system branch created from a full repository URL. set -eu diff --git a/tests.branching/show-system-branch-fails-outside-workspace.script b/tests.branching/show-system-branch-fails-outside-workspace.script index 228e03d9..d227d5b0 100755 --- a/tests.branching/show-system-branch-fails-outside-workspace.script +++ b/tests.branching/show-system-branch-fails-outside-workspace.script @@ -1,4 +1,5 @@ #!/bin/sh +# # Copyright (C) 2012 Codethink Limited # # This program is free software; you can redistribute it and/or modify @@ -15,9 +16,8 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# Check that 'morph show-system-branch' fails when being run -# outside a workspace. - +## Check that 'morph show-system-branch' fails when being run +## outside a workspace. set -eu diff --git a/tests.branching/show-system-branch-fails-when-branch-is-ambiguous.script b/tests.branching/show-system-branch-fails-when-branch-is-ambiguous.script index 58143526..12e23147 100755 --- a/tests.branching/show-system-branch-fails-when-branch-is-ambiguous.script +++ b/tests.branching/show-system-branch-fails-when-branch-is-ambiguous.script @@ -1,4 +1,5 @@ #!/bin/sh +# # Copyright (C) 2012 Codethink Limited # # This program is free software; you can redistribute it and/or modify @@ -15,9 +16,8 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# Check that 'morph show-system-branch' fails when the system branch -# is not obvious. - +## Check that 'morph show-system-branch' fails when the system branch +## is not obvious. set -eu diff --git a/tests.branching/show-system-branch-works-anywhere-with-a-single-branch.script b/tests.branching/show-system-branch-works-anywhere-with-a-single-branch.script index 1b4af8bd..800a8e5b 100755 --- a/tests.branching/show-system-branch-works-anywhere-with-a-single-branch.script +++ b/tests.branching/show-system-branch-works-anywhere-with-a-single-branch.script @@ -1,4 +1,5 @@ #!/bin/sh +# # Copyright (C) 2012 Codethink Limited # # This program is free software; you can redistribute it and/or modify @@ -15,9 +16,8 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# Check that 'morph show-system-branch' works even outside a branch -# if there only is one in the workspcae. - +## Check that 'morph show-system-branch' works even outside a branch +## if there only is one in the workspcae. set -eu diff --git a/tests.branching/show-system-branch-works-in-different-directories-in-a-branch.script b/tests.branching/show-system-branch-works-in-different-directories-in-a-branch.script index c19e4093..d89e671c 100755 --- a/tests.branching/show-system-branch-works-in-different-directories-in-a-branch.script +++ b/tests.branching/show-system-branch-works-in-different-directories-in-a-branch.script @@ -1,4 +1,5 @@ #!/bin/sh +# # Copyright (C) 2012 Codethink Limited # # This program is free software; you can redistribute it and/or modify @@ -15,9 +16,8 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# Check that 'morph show-system-branch' shows the name of the -# current system branch correctly from various working directories. - +## Check that 'morph show-system-branch' shows the name of the +## current system branch correctly from various working directories. set -eu diff --git a/tests.branching/status-in-clean-branch.script b/tests.branching/status-in-clean-branch.script index ec496128..335db9f9 100755 --- a/tests.branching/status-in-clean-branch.script +++ b/tests.branching/status-in-clean-branch.script @@ -1,4 +1,5 @@ #!/bin/sh +# # Copyright (C) 2011, 2012 Codethink Limited # # This program is free software; you can redistribute it and/or modify @@ -15,7 +16,7 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# 'morph status' within a branch +## 'morph status' within a branch set -eu diff --git a/tests.branching/status-in-dirty-branch.script b/tests.branching/status-in-dirty-branch.script index 18aaf61e..c36a0500 100755 --- a/tests.branching/status-in-dirty-branch.script +++ b/tests.branching/status-in-dirty-branch.script @@ -1,4 +1,5 @@ #!/bin/sh +# # Copyright (C) 2011, 2012 Codethink Limited # # This program is free software; you can redistribute it and/or modify @@ -15,7 +16,7 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# 'morph status' within a branch +## 'morph status' within a branch set -eu diff --git a/tests.branching/status-in-workspace.script b/tests.branching/status-in-workspace.script index 63014aee..e998c097 100755 --- a/tests.branching/status-in-workspace.script +++ b/tests.branching/status-in-workspace.script @@ -1,4 +1,5 @@ #!/bin/sh +# # Copyright (C) 2011, 2012 Codethink Limited # # This program is free software; you can redistribute it and/or modify @@ -15,7 +16,7 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# 'morph status' within a workspace +## 'morph status' within a workspace set -eu diff --git a/tests.branching/workflow-petrify.script b/tests.branching/workflow-petrify.script index 35643012..b84dd977 100755 --- a/tests.branching/workflow-petrify.script +++ b/tests.branching/workflow-petrify.script @@ -1,4 +1,5 @@ #!/bin/sh +# # Copyright (C) 2012 Codethink Limited # # This program is free software; you can redistribute it and/or modify @@ -15,9 +16,8 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# Do a complete workflow test, with strata outside the main morphologies -# repository. - +## Do a complete workflow test, with strata outside the main morphologies +## repository. set -eu diff --git a/tests.branching/workflow-separate-stratum-repos.script b/tests.branching/workflow-separate-stratum-repos.script index 97ddb95d..ed549326 100755 --- a/tests.branching/workflow-separate-stratum-repos.script +++ b/tests.branching/workflow-separate-stratum-repos.script @@ -1,4 +1,5 @@ #!/bin/sh +# # Copyright (C) 2012 Codethink Limited # # This program is free software; you can redistribute it and/or modify @@ -15,13 +16,11 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# Do a complete workflow test, with strata outside the main morphologies -# repository. - +## Do a complete workflow test, with strata outside the main morphologies +## repository. set -eu - . "$SRCDIR/scripts/setup-3rd-party-strata" # Make a change to the system diff --git a/tests.branching/workflow.script b/tests.branching/workflow.script index 56415ce4..10383132 100755 --- a/tests.branching/workflow.script +++ b/tests.branching/workflow.script @@ -1,4 +1,5 @@ #!/bin/sh +# # Copyright (C) 2012 Codethink Limited # # This program is free software; you can redistribute it and/or modify @@ -15,12 +16,10 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# Do a complete workflow test with Morph branching and merging. - +## Do a complete workflow test with Morph branching and merging. set -eu - cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" init "$SRCDIR/scripts/test-morph" branch test:morphs me/readme-fix diff --git a/tests.branching/workspace-not-found.script b/tests.branching/workspace-not-found.script index 690f45d3..9e9b5d75 100755 --- a/tests.branching/workspace-not-found.script +++ b/tests.branching/workspace-not-found.script @@ -1,4 +1,5 @@ #!/bin/sh +# # Copyright (C) 2012 Codethink Limited # # This program is free software; you can redistribute it and/or modify @@ -14,6 +15,9 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +## Handle being run from outside workspace directory. + scripts/test-morph init "$DATADIR/workspace" cd "$DATADIR" "$SRCDIR/scripts/test-morph" workspace diff --git a/tests.branching/workspace.script b/tests.branching/workspace.script index f872a37d..e717873c 100755 --- a/tests.branching/workspace.script +++ b/tests.branching/workspace.script @@ -1,4 +1,5 @@ #!/bin/sh +# # Copyright (C) 2012 Codethink Limited # # This program is free software; you can redistribute it and/or modify @@ -14,6 +15,9 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +## morph init: Create a workspace. + scripts/test-morph init "$DATADIR/workspace" mkdir -p "$DATADIR/workspace/a/b/c" cd "$DATADIR/workspace/a/b/c" diff --git a/tests.merging/basic.script b/tests.merging/basic.script index 8eddcfdb..0dbc2367 100755 --- a/tests.merging/basic.script +++ b/tests.merging/basic.script @@ -1,4 +1,5 @@ #!/bin/sh +# # Copyright (C) 2012 Codethink Limited # # This program is free software; you can redistribute it and/or modify @@ -14,8 +15,9 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# Check that "morph merge" merges a system branch into a newly created -# system branch + +## Check that "morph merge" merges a system branch into a newly created +## system branch set -eu diff --git a/tests.merging/conflict-chunks.script b/tests.merging/conflict-chunks.script index 37ee4fb8..e5f6618d 100755 --- a/tests.merging/conflict-chunks.script +++ b/tests.merging/conflict-chunks.script @@ -1,4 +1,5 @@ #!/bin/sh +# # Copyright (C) 2012 Codethink Limited # # This program is free software; you can redistribute it and/or modify @@ -14,8 +15,9 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# When conflicts occur outside the root morphs repository, 'morph merge' -# should keep going until the end and report the list of failed repos. + +## When conflicts occur outside the root morphs repository, 'morph merge' +## should keep going until the end and report the list of failed repos. set -eu diff --git a/tests.merging/conflict-morphology-kind.script b/tests.merging/conflict-morphology-kind.script index 235d8130..ca8403b8 100755 --- a/tests.merging/conflict-morphology-kind.script +++ b/tests.merging/conflict-morphology-kind.script @@ -1,4 +1,5 @@ #!/bin/sh +# # Copyright (C) 2012 Codethink Limited # # This program is free software; you can redistribute it and/or modify @@ -14,7 +15,7 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# If morphology kind differs between branches, it's a merge conflict +## If morphology kind differs between branches, it's a merge conflict set -eu diff --git a/tests.merging/conflict-stratum-field-ordering.script b/tests.merging/conflict-stratum-field-ordering.script index 13ddf3fb..f5bfb4b8 100755 --- a/tests.merging/conflict-stratum-field-ordering.script +++ b/tests.merging/conflict-stratum-field-ordering.script @@ -1,4 +1,5 @@ #!/bin/sh +# # Copyright (C) 2012 Codethink Limited # # This program is free software; you can redistribute it and/or modify @@ -14,13 +15,14 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# Conflict caused by two equivalent strata having different order in two -# different branches -# Morph should possibly resolve this conflict automatically in the future, -# because the meaning of the morphologies is unambiguious if not the -# contents. It depends on how much weight we give to the sort order of -# the morphology from a developer's point of view. +## Conflict caused by two equivalent strata having different order in two +## different branches + +## Morph should possibly resolve this conflict automatically in the future, +## because the meaning of the morphologies is unambiguious if not the +## contents. It depends on how much weight we give to the sort order of +## the morphology from a developer's point of view. set -eu diff --git a/tests.merging/from-branch-not-checked-out.script b/tests.merging/from-branch-not-checked-out.script index a4661622..e51af791 100755 --- a/tests.merging/from-branch-not-checked-out.script +++ b/tests.merging/from-branch-not-checked-out.script @@ -1,4 +1,5 @@ #!/bin/sh +# # Copyright (C) 2012 Codethink Limited # # This program is free software; you can redistribute it and/or modify @@ -14,7 +15,8 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# Handle 'from' branch not being checked out + +## Handle 'from' branch not being checked out set -eu diff --git a/tests.merging/move-chunk-repo.script b/tests.merging/move-chunk-repo.script index a203a824..7b96bc81 100755 --- a/tests.merging/move-chunk-repo.script +++ b/tests.merging/move-chunk-repo.script @@ -1,4 +1,5 @@ #!/bin/sh +# # Copyright (C) 2012 Codethink Limited # # This program is free software; you can redistribute it and/or modify @@ -14,8 +15,9 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# "morph merge" should detect changes in a repo that was added as part of the -# branch and warn the user that the changes will not be merged automatically + +## "morph merge" should detect changes in a repo that was added as part of the +## branch and warn the user that the changes will not be merged automatically set -eu diff --git a/tests.merging/rename-chunk.script b/tests.merging/rename-chunk.script index a50a83bd..ef4c96a2 100755 --- a/tests.merging/rename-chunk.script +++ b/tests.merging/rename-chunk.script @@ -1,4 +1,5 @@ #!/bin/sh +# # Copyright (C) 2012 Codethink Limited # # This program is free software; you can redistribute it and/or modify @@ -14,8 +15,9 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# "morph merge" should pull changes from a chunk even if its name was changed -# in the branch + +## "morph merge" should pull changes from a chunk even if its name was changed +## in the branch set -eu diff --git a/tests.merging/rename-stratum.script b/tests.merging/rename-stratum.script index b0e5d57e..c5c92823 100755 --- a/tests.merging/rename-stratum.script +++ b/tests.merging/rename-stratum.script @@ -1,4 +1,5 @@ #!/bin/sh +# # Copyright (C) 2012 Codethink Limited # # This program is free software; you can redistribute it and/or modify @@ -14,8 +15,9 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# "morph merge" should deal with stratum renames; currently it doesn't deal -# very well, but at least we don't crash. + +## "morph merge" should deal with stratum renames; currently it doesn't deal +## very well, but at least we don't crash. set -eu diff --git a/tests.merging/warn-if-merging-petrified-morphologies.script b/tests.merging/warn-if-merging-petrified-morphologies.script index a81c0237..5753786c 100755 --- a/tests.merging/warn-if-merging-petrified-morphologies.script +++ b/tests.merging/warn-if-merging-petrified-morphologies.script @@ -1,4 +1,5 @@ #!/bin/sh +# # Copyright (C) 2012 Codethink Limited # # This program is free software; you can redistribute it and/or modify @@ -14,8 +15,9 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# If the user merges a petrified branch into an unpetrified branch, -# we should warn them. + +## If the user merges a petrified branch into an unpetrified branch, +## we should warn them. set -eu diff --git a/tests/build-chunk-failures-dump-log.script b/tests/build-chunk-failures-dump-log.script index 05a3bd8a..3e0985d8 100755 --- a/tests/build-chunk-failures-dump-log.script +++ b/tests/build-chunk-failures-dump-log.script @@ -1,22 +1,23 @@ #!/bin/bash # -# Test building a chunk. -# # Copyright (C) 2011, 2012 Codethink Limited -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License along # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +## Test building a chunk that fails. + set -eu chunkrepo="$DATADIR/chunk-repo" diff --git a/tests/build-chunk-writes-log.script b/tests/build-chunk-writes-log.script index e34914df..a258bf99 100755 --- a/tests/build-chunk-writes-log.script +++ b/tests/build-chunk-writes-log.script @@ -1,22 +1,23 @@ #!/bin/sh # -# Test building a chunk. -# # Copyright (C) 2011, 2012 Codethink Limited -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License along # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +## Test building a chunk - build log should be saved. + set -eu "$SRCDIR/scripts/test-morph" build-morphology test:chunk-repo farrokh hello diff --git a/tests/build-chunk.script b/tests/build-chunk.script index e69515b3..9728f939 100755 --- a/tests/build-chunk.script +++ b/tests/build-chunk.script @@ -1,22 +1,23 @@ #!/bin/sh # -# Test building a chunk. -# # Copyright (C) 2011, 2012 Codethink Limited -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License along # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +## Test building a chunk. + set -eu "$SRCDIR/scripts/test-morph" build-morphology test:chunk-repo farrokh hello diff --git a/tests/build-stratum-with-submodules.script b/tests/build-stratum-with-submodules.script index 2a99b12d..1799d74a 100755 --- a/tests/build-stratum-with-submodules.script +++ b/tests/build-stratum-with-submodules.script @@ -1,22 +1,23 @@ #!/bin/sh # -# Test build a stratum that uses a chunk which needs a submodule. -# # Copyright (C) 2011, 2012 Codethink Limited -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License along # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +## Test build a stratum that uses a chunk which needs a submodule. + set -eu # tests/setup creates a chunk-repo. We now create a new chunk, which diff --git a/tests/build-stratum.script b/tests/build-stratum.script index d4909e9a..ac210129 100755 --- a/tests/build-stratum.script +++ b/tests/build-stratum.script @@ -1,22 +1,23 @@ #!/bin/sh # -# Test build a simple stratum. -# # Copyright (C) 2011, 2012 Codethink Limited -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License along # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +## Test build a simple stratum. + set -eu "$SRCDIR/scripts/test-morph" build-morphology \ diff --git a/tests/build-system-autotools-fails-if-autogen-fails.script b/tests/build-system-autotools-fails-if-autogen-fails.script index fb80fc72..46510516 100755 --- a/tests/build-system-autotools-fails-if-autogen-fails.script +++ b/tests/build-system-autotools-fails-if-autogen-fails.script @@ -1,24 +1,24 @@ #!/bin/sh # -# Test that the autotools build system fails if it runs autogen.sh and that -# fails. -# # Copyright (C) 2012 Codethink Limited -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License along # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +## Test that the autotools build system fails if it runs autogen.sh and that +## fails. + set -eu x="$DATADIR/autogen-chunk" diff --git a/tests/build-system-autotools.script b/tests/build-system-autotools.script index f23eb04e..6037d1b5 100755 --- a/tests/build-system-autotools.script +++ b/tests/build-system-autotools.script @@ -1,24 +1,24 @@ #!/bin/sh # -# Convert the hello-chunk project to something autotools-like, then -# build it. -# # Copyright (C) 2011, 2012 Codethink Limited -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License along # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +## Convert the hello-chunk project to something autotools-like, then +## build it. + set -eu chunkrepo="$DATADIR/chunk-repo" diff --git a/tests/build-system-cpan.script b/tests/build-system-cpan.script index aec91873..9217ab16 100755 --- a/tests/build-system-cpan.script +++ b/tests/build-system-cpan.script @@ -1,22 +1,23 @@ #!/bin/sh # -# Convert the hello-chunk project to perl with CPAN -# # Copyright (C) 2011, 2012 Codethink Limited -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License along # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +## Convert the hello-chunk project to perl with CPAN and build. + set -eu chunkrepo="$DATADIR/chunk-repo" diff --git a/tests/build-system-python-distutils.script b/tests/build-system-python-distutils.script index d7be93bd..683599f2 100755 --- a/tests/build-system-python-distutils.script +++ b/tests/build-system-python-distutils.script @@ -1,23 +1,23 @@ #!/bin/sh # -# Convert the hello-chunk project to python with distutils -# # Copyright (C) 2011, 2012 Codethink Limited -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License along # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +## Convert the hello-chunk project to python with distutils and build. + set -eu chunkrepo="$DATADIR/chunk-repo" diff --git a/tests/missing-ref.script b/tests/missing-ref.script index 2da9fa05..26183af3 100755 --- a/tests/missing-ref.script +++ b/tests/missing-ref.script @@ -1,22 +1,23 @@ #!/bin/sh # -# Test building with a bad reference. -# # Copyright (C) 2011,2012 Codethink Limited -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License along # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +## Test building with a bad reference. + "$SRCDIR/scripts/test-morph" build-morphology \ test:chunk-repo non-existent-branch hello diff --git a/tests/morphless-chunks.script b/tests/morphless-chunks.script index 315f42ea..d7b068da 100755 --- a/tests/morphless-chunks.script +++ b/tests/morphless-chunks.script @@ -1,23 +1,24 @@ #!/bin/sh -# Try to build a morphless chunk. +# # Copyright (C) 2012 Codethink Limited -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License along # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -set -eu +## Try to build a morphless chunk. +set -eu # Create an auto-detectable chunk. diff --git a/tests/name-clash.script b/tests/name-clash.script index 9a3e942b..b1df563c 100755 --- a/tests/name-clash.script +++ b/tests/name-clash.script @@ -1,25 +1,26 @@ #!/bin/sh # -# Test when there are two chunks with the same "name" set in the morphology -# cause only the first built to be used -# This can cause build failures when the wrong name is set and could be -# a vector for including dodgy data in a system -# # Copyright (C) 2012 Codethink Limited -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License along # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +## When there are two chunks with the same "name" set in the morphology, +## only the first built should be used. This can cause build failures when +## the wrong name is set and could be a vector for including dodgy data in +## a system. + set -eu ( cd "$DATADIR/chunk-repo" diff --git a/tests/rebuild-cached-stratum.script b/tests/rebuild-cached-stratum.script index 2615fb30..70cc54cf 100755 --- a/tests/rebuild-cached-stratum.script +++ b/tests/rebuild-cached-stratum.script @@ -1,25 +1,26 @@ #!/bin/sh # -# Does a cached stratum get rebuilt if its chunk changes? -# This tests a bug that is currently in morph, where the stratum does -# not get rebuilt in that case. Later on, the test will guard against -# regressions. -# # Copyright (C) 2011, 2012 Codethink Limited -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License along # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +## Does a cached stratum get rebuilt if its chunk changes? +## This tests a bug that is currently in morph, where the stratum does +## not get rebuilt in that case. Later on, the test will guard against +## regressions. + set -eu cache="$DATADIR/cache/artifacts" diff --git a/tests/show-dependencies.script b/tests/show-dependencies.script index aad036e9..056b81b2 100755 --- a/tests/show-dependencies.script +++ b/tests/show-dependencies.script @@ -1,22 +1,23 @@ #!/bin/bash # -# Test "show-dependencies" subcommand. -# # Copyright (C) 2012 Codethink Limited -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License along # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +## Test "show-dependencies" subcommand. + set -eu "$SRCDIR/scripts/test-morph" \ diff --git a/tests/stratum-overlap-warns.script b/tests/stratum-overlap-warns.script index 8cf1606c..c9aeed72 100755 --- a/tests/stratum-overlap-warns.script +++ b/tests/stratum-overlap-warns.script @@ -1,23 +1,24 @@ #!/bin/sh # -# If a stratum has multiple chunks that have the same files in them, -# then this should be notified -# # Copyright (C) 2011, 2012 Codethink Limited -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License along # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +## If a stratum has multiple chunks that have the same files in them, +## then this should be noted. + set -eu log="$DATADIR/morph.log" diff --git a/tests/stratum-overlap-writes-overlap.script b/tests/stratum-overlap-writes-overlap.script index d06b4677..a52d1ba7 100755 --- a/tests/stratum-overlap-writes-overlap.script +++ b/tests/stratum-overlap-writes-overlap.script @@ -1,23 +1,24 @@ #!/bin/sh # -# If a stratum has multiple chunks that have the same files in them, -# then the overlaps must be written to the cache -# # Copyright (C) 2011, 2012 Codethink Limited -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License along # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +## If a stratum has multiple chunks that have the same files in them, +## then the overlaps must be written to the cache + set -eu cache="$DATADIR/cache/artifacts" diff --git a/tests/trove-prefix.script b/tests/trove-prefix.script index 612311f3..0f8cee3f 100755 --- a/tests/trove-prefix.script +++ b/tests/trove-prefix.script @@ -1,7 +1,5 @@ #!/bin/sh # -# Verify that trove-prefix (and by corollary trove-host) work properly. -# # Copyright (C) 2012 Codethink Limited # # This program is free software; you can redistribute it and/or modify @@ -17,6 +15,9 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +## Verify that trove-prefix (and by corollary trove-host) work properly. + set -eu RAWDUMP="$DATADIR/raw-configdump" diff --git a/tests/update-gits-chunk.script b/tests/update-gits-chunk.script index 55bdebd0..c2ad08d0 100755 --- a/tests/update-gits-chunk.script +++ b/tests/update-gits-chunk.script @@ -1,22 +1,23 @@ #!/bin/bash # # Copyright (C) 2012 Codethink Limited -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License along # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# Test that 'morph update-gits' updates every chunk listed on the -# command line. + +## Test that 'morph update-gits' updates every chunk listed on the +## command line. set -eu diff --git a/tests/update-gits-stratum.script b/tests/update-gits-stratum.script index 04511563..112a8973 100755 --- a/tests/update-gits-stratum.script +++ b/tests/update-gits-stratum.script @@ -1,22 +1,23 @@ #!/bin/bash # # Copyright (C) 2012 Codethink Limited -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License along # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# Test that 'morph update-gits' updates every chunk that depends on the -# strata listed on the command line. + +## Test that 'morph update-gits' updates every chunk that depends on the +## strata listed on the command line. set -eu diff --git a/tests/update-gits-submodules.script b/tests/update-gits-submodules.script index ad5f220c..66d35897 100755 --- a/tests/update-gits-submodules.script +++ b/tests/update-gits-submodules.script @@ -1,22 +1,23 @@ #!/bin/bash # # Copyright (C) 2012 Codethink Limited -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License along # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# Test that 'morph update-gits' caches all the submodules needed by -# a chunk. + +## Test that 'morph update-gits' caches all the submodules needed by +## a chunk. set -eu diff --git a/tests/uses-tempdir.script b/tests/uses-tempdir.script index 328413dd..a4aac557 100755 --- a/tests/uses-tempdir.script +++ b/tests/uses-tempdir.script @@ -1,23 +1,24 @@ #!/bin/sh # -# Test that temporary directories are created in the dir specified -# by --tempdir rather than specified in the environment by TMPDIR. -# # Copyright (C) 2011, 2012 Codethink Limited -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License along # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +## Test that temporary directories are created in the dir specified +## by --tempdir rather than specified in the environment by TMPDIR. + set -eu export TMPDIR TMPDIR="$DATADIR"/unwritable-tmp |