diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2012-09-11 16:43:36 +0100 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2012-09-13 12:01:39 +0100 |
| commit | ef0b21be1845d69886bd84f402725e439fc928b4 (patch) | |
| tree | 9cba3580ab766c7def3307089ef3c1d07415192e /tests.as-root | |
| parent | 8c87a657236c64ff640589e2d27cb0b347f3691a (diff) | |
| download | morph-ef0b21be1845d69886bd84f402725e439fc928b4.tar.gz | |
tests: Always use fixed git committer info
Move this into a script which can be sourced by the 'setup' scripts
and the actual tests (this is needed as the environment in 'setup' is
not passed on to the tests).
Diffstat (limited to 'tests.as-root')
5 files changed, 10 insertions, 12 deletions
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 c00ef637..ecb3b0e0 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 @@ -19,6 +19,8 @@ set -eu +source "$SRCDIR/scripts/fix-committer-info" + # Initialise the workspace. cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" init @@ -37,6 +39,7 @@ git config -f "$DATADIR/workspace/branch1/test:morphs-repo/.git/config" \ git config -f "$DATADIR/workspace/branch1/test:kernel-repo/.git/config" \ morph.uuid AABBCCDDE + # Build once. cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" build linux-system 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 0942bc82..002f4abd 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 @@ -19,6 +19,8 @@ set -eu +source "$SRCDIR/scripts/fix-committer-info" + # Initialise the workspace. cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" init 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 3bb32f17..0d0b70b1 100755 --- a/tests.as-root/building-a-system-branch-works-anywhere.script +++ b/tests.as-root/building-a-system-branch-works-anywhere.script @@ -19,6 +19,8 @@ set -eu +source "$SRCDIR/scripts/fix-committer-info" + # Initialise the workspace. cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" init diff --git a/tests.as-root/building-creates-correct-temporary-refs.script b/tests.as-root/building-creates-correct-temporary-refs.script index 87ba6db6..c3ee7019 100755 --- a/tests.as-root/building-creates-correct-temporary-refs.script +++ b/tests.as-root/building-creates-correct-temporary-refs.script @@ -19,6 +19,8 @@ set -eu +source "$SRCDIR/scripts/fix-committer-info" + # Initialise the workspace. cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" init diff --git a/tests.as-root/setup b/tests.as-root/setup index f8077165..1392450e 100755 --- a/tests.as-root/setup +++ b/tests.as-root/setup @@ -28,18 +28,7 @@ set -eu -export GIT_AUTHOR_NAME -export GIT_AUTHOR_EMAIL -export GIT_AUTHOR_DATE -export GIT_COMMITTER_NAME -export GIT_COMMITTER_EMAIL -export GIT_COMMITTER_DATE -GIT_AUTHOR_NAME=developer -GIT_AUTHOR_EMAIL=developer@example.com -GIT_AUTHOR_DATE="1343753514 +0000" -GIT_COMMITTER_NAME=developer -GIT_COMMITTER_EMAIL=developer@example.com -GIT_COMMITTER_DATE="1343753514 +0000" +source "$SRCDIR/scripts/fix-committer-info" # The $DATADIR should be empty at the beginnig of each test. find "$DATADIR" -mindepth 1 -delete |