summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wirzenius <lars.wirzenius@codethink.co.uk>2012-08-28 14:38:32 +0100
committerLars Wirzenius <lars.wirzenius@codethink.co.uk>2012-08-28 14:38:32 +0100
commit05f41b326febc6bc379c214d2ae54a0f7cc8331e (patch)
treeefb727f8cf85138fd8c3393a3437d4339be93144
parent4e6f9187537a479be8260c66fbc5fbbceac585bf (diff)
downloadlorry-05f41b326febc6bc379c214d2ae54a0f7cc8331e.tar.gz
Set $USER etc for CVS test setup script
-rw-r--r--lorry.morph1
-rwxr-xr-xtests/cvs-single-commit.setup5
2 files changed, 6 insertions, 0 deletions
diff --git a/lorry.morph b/lorry.morph
index 818b5d6..69de4fd 100644
--- a/lorry.morph
+++ b/lorry.morph
@@ -3,6 +3,7 @@
"kind": "chunk",
"build-commands": [
"git branch -a",
+ "cat tests/cvs-single-commit.script",
"bzr whoami 'Lorry test suite <baserock-dev@baserock.org>'",
"python setup.py check",
"python setup.py build"
diff --git a/tests/cvs-single-commit.setup b/tests/cvs-single-commit.setup
index c94f07c..537de81 100755
--- a/tests/cvs-single-commit.setup
+++ b/tests/cvs-single-commit.setup
@@ -20,6 +20,11 @@
set -e
+# CVS wants $USER, $LOGNAME, and $LOGNAME set to a real username.
+export USER=root
+export LOGNAME=$USER
+export USERNAME=$USER
+
# create the repository
repo="$DATADIR/cvs-test-repo"
export CVSROOT="$repo"