summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorLars Wirzenius <liw@liw.fi>2015-06-20 16:58:35 +0300
committerLars Wirzenius <liw@liw.fi>2015-06-20 17:22:04 +0300
commit174d33c14b0236319144628a7de523920b8777f8 (patch)
treed9b1b5cb0feb2b4657c9d9c910b5ad2822b5c4ba /doc
parent121a0a5f182ccf616ceec3e5c4a2c2c4d03120a1 (diff)
downloadick-174d33c14b0236319144628a7de523920b8777f8.tar.gz
Tweaks to test scenario for cleanly
Diffstat (limited to 'doc')
-rw-r--r--doc/060-cleanly.yarn13
-rw-r--r--doc/900-implements.yarn1
2 files changed, 7 insertions, 7 deletions
diff --git a/doc/060-cleanly.yarn b/doc/060-cleanly.yarn
index 602fc3d..359fc67 100644
--- a/doc/060-cleanly.yarn
+++ b/doc/060-cleanly.yarn
@@ -37,9 +37,10 @@ We create a tar archive by extracing the source code from git.
## Create Debian source package
Next up is the Debian source package. We assume the upstream project
-provides the Debian packaging files in the same branch and that the
-Debian version part is just 1. (FIXME: This will need to be made more
-flexible later.)
+provides the Debian packaging files in the same branch. Since we're
+doing a CI build, the upstream version number gets mangled and the
+Debian version is always just 1 with the target's Debian release
+appended.
WHEN user runs, in foo,
... cleanly --ci --buildno 42 --debian-release debian7 dsc
@@ -50,9 +51,9 @@ flexible later.)
## Build a Debian binary package
This is where things get interesting. We build a Debian binary
-package, given a source package. (Note that for this, we fake the
-actual build to avoid having to have `root` access.)
+package, given a source package. (Note that for this scenario, we fake
+the actual build to avoid having to have `root` access.)
WHEN user runs, in foo,
- ... cleanly --ci --buildno 42 --debian-release debian7 deb
+ ... cleanly --test-mode --ci --buildno 42 --debian-release debian7 deb
THEN file foo_3.2.ci42-1.debian7_all.deb exists
diff --git a/doc/900-implements.yarn b/doc/900-implements.yarn
index 8a7155f..600fdaa 100644
--- a/doc/900-implements.yarn
+++ b/doc/900-implements.yarn
@@ -131,7 +131,6 @@ later investigation.
# Note that we do NOT quote the second match. We let the shell
# parse it as-is. This is necessary to allow multiple arguments.
if ! "$SRCDIR/icklib/cleanly" --no-default-config \
- --test-mode \
--log "$DATADIR/cleanly.log" \
--results "$DATADIR" $MATCH_2 \
> "$DATADIR/cleanly.stdout" \