chiark / gitweb /
dgit.git
12 months agoi18n: i18n-diff-auditor: add copyright notice
Ian Jackson [Mon, 1 Oct 2018 12:25:48 +0000 (13:25 +0100)]
i18n: i18n-diff-auditor: add copyright notice

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
12 months agoi18n: dgit: mark some messages (6)
Ian Jackson [Sun, 30 Sep 2018 01:38:42 +0000 (02:38 +0100)]
i18n: dgit: mark some messages (6)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
12 months agoi18n: dgit: mark some messages (5)
Ian Jackson [Mon, 1 Oct 2018 01:48:06 +0000 (02:48 +0100)]
i18n: dgit: mark some messages (5)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
12 months agodgit: rearrange some strings to prep for translation
Ian Jackson [Mon, 1 Oct 2018 01:11:21 +0000 (02:11 +0100)]
dgit: rearrange some strings to prep for translation

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
12 months agoi18n: dgit: mark some messages (4)
Ian Jackson [Mon, 1 Oct 2018 00:14:42 +0000 (01:14 +0100)]
i18n: dgit: mark some messages (4)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
12 months agodgit: splitbrain_pseudomerge: Introduce $arch_v (nfc
Ian Jackson [Mon, 1 Oct 2018 00:13:57 +0000 (01:13 +0100)]
dgit: splitbrain_pseudomerge: Introduce $arch_v (nfc

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
12 months agoi18n: dgit: mark some messages (3)
Ian Jackson [Sat, 29 Sep 2018 14:56:55 +0000 (15:56 +0100)]
i18n: dgit: mark some messages (3)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
12 months agoi18n: dgit: mark some messages (2)
Ian Jackson [Sat, 29 Sep 2018 14:26:02 +0000 (15:26 +0100)]
i18n: dgit: mark some messages (2)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
12 months agoi18n: dgit: mark some messages (1)
Ian Jackson [Sat, 29 Sep 2018 10:43:19 +0000 (11:43 +0100)]
i18n: dgit: mark some messages (1)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
12 months agoi18n: i18n-diff-auditor: fix a message
Ian Jackson [Mon, 1 Oct 2018 02:22:52 +0000 (03:22 +0100)]
i18n: i18n-diff-auditor: fix a message

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
12 months agoi18n: i18n-diff-auditor: support die -> fail
Ian Jackson [Mon, 1 Oct 2018 02:22:40 +0000 (03:22 +0100)]
i18n: i18n-diff-auditor: support die -> fail

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
12 months agoi18n: i18n-diff-auditor: fix new invented here doc
Ian Jackson [Mon, 1 Oct 2018 02:22:15 +0000 (03:22 +0100)]
i18n: i18n-diff-auditor: fix new invented here doc

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
12 months agoi18n: i18n-diff-auditor: handle invented here doc end differently
Ian Jackson [Mon, 1 Oct 2018 02:05:08 +0000 (03:05 +0100)]
i18n: i18n-diff-auditor: handle invented here doc end differently

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
12 months agoi18n: i18n-diff-auditor: debugging changes
Ian Jackson [Mon, 1 Oct 2018 02:04:48 +0000 (03:04 +0100)]
i18n: i18n-diff-auditor: debugging changes

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
12 months agoi18n: i18n-diff-auditor: fix here doc regexp
Ian Jackson [Mon, 1 Oct 2018 01:44:00 +0000 (02:44 +0100)]
i18n: i18n-diff-auditor: fix here doc regexp

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
12 months agoi18n: i18n-diff-auditor: Print deleted text
Ian Jackson [Mon, 1 Oct 2018 01:40:20 +0000 (02:40 +0100)]
i18n: i18n-diff-auditor: Print deleted text

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
12 months agoi18n: i18n-diff-auditor: Make qp global (nfc)
Ian Jackson [Mon, 1 Oct 2018 01:39:47 +0000 (02:39 +0100)]
i18n: i18n-diff-auditor: Make qp global (nfc)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
12 months agoi18n: i18n-diff-auditor: further not exactly debugging improvement
Ian Jackson [Mon, 1 Oct 2018 00:52:56 +0000 (01:52 +0100)]
i18n: i18n-diff-auditor: further not exactly debugging improvement

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
12 months agoi18n: i18n-diff-auditor: more debugging improvement
Ian Jackson [Mon, 1 Oct 2018 00:45:50 +0000 (01:45 +0100)]
i18n: i18n-diff-auditor: more debugging improvement

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
12 months agoi18n: i18n-diff-auditor: bugfixes
Ian Jackson [Mon, 1 Oct 2018 00:45:24 +0000 (01:45 +0100)]
i18n: i18n-diff-auditor: bugfixes

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
12 months agoi18n: i18n-diff-auditor: Handle some ( __ etc., without +(
Ian Jackson [Mon, 1 Oct 2018 00:06:44 +0000 (01:06 +0100)]
i18n: i18n-diff-auditor: Handle some ( __ etc., without +(

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
12 months agoi18n: i18n-diff-auditor: fix `on was non-string' message
Ian Jackson [Sun, 30 Sep 2018 23:47:53 +0000 (00:47 +0100)]
i18n: i18n-diff-auditor: fix `on was non-string' message

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
12 months agoi18n: i18n-diff-auditor: handle "..." strings as arguments to f_
Ian Jackson [Sun, 30 Sep 2018 23:42:40 +0000 (00:42 +0100)]
i18n: i18n-diff-auditor: handle "..." strings as arguments to f_

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
12 months agoi18n: i18n-diff-auditor: fix bra and ket regexps
Ian Jackson [Sun, 30 Sep 2018 23:42:22 +0000 (00:42 +0100)]
i18n: i18n-diff-auditor: fix bra and ket regexps

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
12 months agoi18n: i18n-diff-auditor: ignore space in old "-string only in brackets
Ian Jackson [Sun, 30 Sep 2018 23:34:18 +0000 (00:34 +0100)]
i18n: i18n-diff-auditor: ignore space in old "-string only in brackets

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
12 months agoi18n: i18n-diff-auditor: add two simple cases
Ian Jackson [Sun, 30 Sep 2018 23:33:01 +0000 (00:33 +0100)]
i18n: i18n-diff-auditor: add two simple cases

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
12 months agoi18n: i18n-diff-auditor: recognise tail concatenation
Ian Jackson [Sun, 30 Sep 2018 23:28:26 +0000 (00:28 +0100)]
i18n: i18n-diff-auditor: recognise tail concatenation

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
12 months agoi18n: i18n-diff-auditor: tiny debug improvement
Ian Jackson [Sun, 30 Sep 2018 23:28:11 +0000 (00:28 +0100)]
i18n: i18n-diff-auditor: tiny debug improvement

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
12 months agoi18n: i18n-diff-auditor: fix striang (de)concatenation
Ian Jackson [Sun, 30 Sep 2018 23:17:20 +0000 (00:17 +0100)]
i18n: i18n-diff-auditor: fix striang (de)concatenation

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
12 months agoi18n: i18n-diff-auditor: understand i_
Ian Jackson [Sun, 30 Sep 2018 22:45:04 +0000 (23:45 +0100)]
i18n: i18n-diff-auditor: understand i_

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
12 months agoi18n: i18n-diff-auditor: introduce is_trans (nfc)
Ian Jackson [Sun, 30 Sep 2018 22:38:29 +0000 (23:38 +0100)]
i18n: i18n-diff-auditor: introduce is_trans (nfc)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
12 months agoi18n: i18n-diff-auditor: remove a stray print
Ian Jackson [Sun, 30 Sep 2018 22:36:33 +0000 (23:36 +0100)]
i18n: i18n-diff-auditor: remove a stray print

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
12 months agoi18n: i18n-diff-auditor: improve debug output
Ian Jackson [Sun, 30 Sep 2018 22:35:31 +0000 (23:35 +0100)]
i18n: i18n-diff-auditor: improve debug output

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
12 months agoi18n: i18n-diff-auditor: fixes and minor improvements
Ian Jackson [Sun, 30 Sep 2018 22:27:33 +0000 (23:27 +0100)]
i18n: i18n-diff-auditor: fixes and minor improvements

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
12 months agoi18n: i18n-diff-auditor: fix multi-arg handling
Ian Jackson [Sun, 30 Sep 2018 20:21:40 +0000 (21:21 +0100)]
i18n: i18n-diff-auditor: fix multi-arg handling

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
12 months agoi18n: i18n-diff-auditor: more debug
Ian Jackson [Sun, 30 Sep 2018 20:07:42 +0000 (21:07 +0100)]
i18n: i18n-diff-auditor: more debug

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
12 months agoi18n: i18n-diff-auditor: fix debug
Ian Jackson [Sun, 30 Sep 2018 20:02:13 +0000 (21:02 +0100)]
i18n: i18n-diff-auditor: fix debug

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
12 months agoi18n: i18n-diff-auditor: New script for checking i18n work
Ian Jackson [Sun, 30 Sep 2018 19:54:27 +0000 (20:54 +0100)]
i18n: i18n-diff-auditor: New script for checking i18n work

(copied from "play" repo, 67fc89a905d3f922ffb3e33172cd8b8343945b1c)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
12 months agoi18n: Provide i_ (identity function, tags for translation)
Ian Jackson [Sat, 29 Sep 2018 12:02:51 +0000 (13:02 +0100)]
i18n: Provide i_ (identity function, tags for translation)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
12 months agotest suite: t-expect-fail: Set LANGUAGE too
Ian Jackson [Sat, 29 Sep 2018 10:43:24 +0000 (11:43 +0100)]
test suite: t-expect-fail: Set LANGUAGE too

The user may have this in their environment, in which case we must
squash it too.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
12 months agotest suite: i18n-messages: Test message translation
Ian Jackson [Sat, 29 Sep 2018 10:23:18 +0000 (11:23 +0100)]
test suite: i18n-messages: Test message translation

We test just one of the messages I provided for en_US.UTF-8.
That's probably sufficient.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
12 months agotest suite: New restriction x-dgit-out-of-tree-only
Ian Jackson [Sat, 29 Sep 2018 10:19:45 +0000 (11:19 +0100)]
test suite: New restriction x-dgit-out-of-tree-only

This is filtered out of debian/tests/control, but honoured in-tree.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
12 months agotests suite; t-expect-fail: Honour expect_fail_lcmessages
Ian Jackson [Sat, 29 Sep 2018 10:19:02 +0000 (11:19 +0100)]
tests suite; t-expect-fail: Honour expect_fail_lcmessages

No users yet so NFC.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
12 months agoi18n: Call po/Makefile directly from debian/rules
Ian Jackson [Sat, 29 Sep 2018 00:50:09 +0000 (01:50 +0100)]
i18n: Call po/Makefile directly from debian/rules

This makefile likes to dirty things quite a bit, since that's how
gettext seems to like to work.  In our call from debian/rules, we
avoid that.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
12 months ago118n: Translate one message as a sample
Ian Jackson [Sat, 29 Sep 2018 00:47:25 +0000 (01:47 +0100)]
118n: Translate one message as a sample

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
12 months agoi18n: Start en_US.po
Ian Jackson [Sat, 29 Sep 2018 00:40:47 +0000 (01:40 +0100)]
i18n: Start en_US.po

This is going to be our test/demo translation.
Generated using
  make -C po en_US.po
and then editing these header fields by hand
  PO-Revision-Date
  Last-Translator
  Language-Team

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
12 months agoi18n: Generate initial messages.pot
Ian Jackson [Sat, 29 Sep 2018 00:35:27 +0000 (01:35 +0100)]
i18n: Generate initial messages.pot

`make -C po'

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
12 months agoi18n: sub prototypes for __ and f_
Ian Jackson [Sat, 29 Sep 2018 10:35:09 +0000 (11:35 +0100)]
i18n: sub prototypes for __ and f_

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
12 months agoi18n: Rename ___ to f_
Ian Jackson [Sat, 29 Sep 2018 10:00:22 +0000 (11:00 +0100)]
i18n: Rename ___ to f_

I have decided that's a better name.  Not _f because, unlike
printf (where f is done first, and then print), here the _ is done
first and then f.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
12 months agoi18n: Machinery in po/
Ian Jackson [Sat, 29 Sep 2018 00:28:16 +0000 (01:28 +0100)]
i18n: Machinery in po/

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
12 months agoi18n: Flag a handful of messages for translation
Ian Jackson [Sat, 29 Sep 2018 00:24:24 +0000 (01:24 +0100)]
i18n: Flag a handful of messages for translation

This is just useful for testing the forthcoming machinery, so far.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
12 months agoi18n: Source-level framework: call setlocale, provide __ and ___
Ian Jackson [Sat, 29 Sep 2018 00:20:17 +0000 (01:20 +0100)]
i18n: Source-level framework: call setlocale, provide __ and ___

This is the general plumbing for looking up translated messages - the
consumer-side.  No actual messages are flagged for translation yet.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
12 months agoi18n: Copy po/Makefile and remove-potcdate.plfrom debconf
Ian Jackson [Mon, 30 Jul 2018 06:11:29 +0000 (07:11 +0100)]
i18n: Copy po/Makefile and remove-potcdate.plfrom debconf

These are from debconf.git a326240dd50487732d8546858994d48b45bf0b20.

There doesn't seem to be a common library for this kind of thing.  I'm
going to take debconf as a good example and nick the code.

Copyright: the debian/copyright file of debconf says it's
BSD-2-clause.  So add that, and copyright notices based on "git log"
(which does seem comprehensive).

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
12 months agochangelog: start 6.13
Ian Jackson [Fri, 28 Sep 2018 17:19:17 +0000 (18:19 +0100)]
changelog: start 6.13

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
12 months agochangelog: Finalise 6.12 archive/debian/6.12 debian/6.12
Ian Jackson [Fri, 28 Sep 2018 17:17:23 +0000 (18:17 +0100)]
changelog: Finalise 6.12

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
12 months agotest suite: t-check-only-bpd: Check $tmp/.. not ..
Ian Jackson [Fri, 28 Sep 2018 17:04:03 +0000 (18:04 +0100)]
test suite: t-check-only-bpd: Check $tmp/.. not ..

The test might call t-ok in $p, say, or in $tmp.

The effect of this bug was that in tests where t-ok was called in
$tmp, it looked in $tmp/.. which might contain anything, rather than
$tmp as intended.  That means the test was not effective.

Also it causes a spurious failure of t-import-nonnative in the Ubuntu
CI infrastructure, where $AUTOPKGTEST_TMP/../autopkgtest-satdep.deb
happens to exist.

Reported-by: Mattia Rizzolo <mattia@debian.org>
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
13 months agochangelog: start 6.12
Ian Jackson [Sun, 26 Aug 2018 20:59:12 +0000 (21:59 +0100)]
changelog: start 6.12

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
13 months agochangelog: Documentation changes and finalise 6.11 archive/debian/6.11 debian/6.11
Ian Jackson [Sun, 26 Aug 2018 20:57:22 +0000 (21:57 +0100)]
changelog: Documentation changes and finalise 6.11

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
13 months agodgit-maint-debrebase(7): Formatting & wording tweaks
Sean Whitton [Sun, 26 Aug 2018 16:24:49 +0000 (09:24 -0700)]
dgit-maint-debrebase(7): Formatting & wording tweaks

Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
13 months agodgit-maint-debrebase(7): Avoid some uses of =item
Sean Whitton [Sun, 26 Aug 2018 16:24:13 +0000 (09:24 -0700)]
dgit-maint-debrebase(7): Avoid some uses of =item

Commands for the user to type into their shell should have empty lines
above and below them; this ensures that.  Admittedly while making the
POD source harder to read.

Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
13 months agodgit-maint-debrebase(7): demote "Inspecting the history"
Sean Whitton [Sun, 26 Aug 2018 16:13:27 +0000 (09:13 -0700)]
dgit-maint-debrebase(7): demote "Inspecting the history"

Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
13 months agoDrop obsolete local-pod-man script, now replaced by make %.view
Ian Jackson [Sun, 26 Aug 2018 14:36:32 +0000 (15:36 +0100)]
Drop obsolete local-pod-man script, now replaced by make %.view

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
13 months agoMakefile: Adjust scope of dgit(7) pod rule
Ian Jackson [Sat, 30 Jun 2018 20:34:46 +0000 (21:34 +0100)]
Makefile: Adjust scope of dgit(7) pod rule

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
13 months agochangelog: start 6.11
Ian Jackson [Sun, 26 Aug 2018 13:59:37 +0000 (14:59 +0100)]
changelog: start 6.11

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
13 months agochangelog: finalise 6.10 archive/debian/6.10 debian/6.10
Ian Jackson [Sun, 26 Aug 2018 13:58:24 +0000 (14:58 +0100)]
changelog: finalise 6.10

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
13 months agochangelog: Tidy up, preparatory to release
Ian Jackson [Sat, 25 Aug 2018 17:11:40 +0000 (18:11 +0100)]
changelog: Tidy up, preparatory to release

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
13 months agochangelog: Run gbp-dch
Ian Jackson [Sat, 25 Aug 2018 16:56:43 +0000 (17:56 +0100)]
changelog: Run gbp-dch

Needs tidying up.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
13 months agodgit: Pass --no-source to sbuild (always)
Ian Jackson [Sun, 26 Aug 2018 12:41:22 +0000 (13:41 +0100)]
dgit: Pass --no-source to sbuild (always)

Closes: #904966.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
13 months agotest suite: Test dgit build --build=
Ian Jackson [Sun, 26 Aug 2018 12:33:57 +0000 (13:33 +0100)]
test suite: Test dgit build --build=

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
13 months agodgit: build-*: Cope with new-style --build= specifications
Ian Jackson [Sun, 26 Aug 2018 12:28:28 +0000 (13:28 +0100)]
dgit: build-*: Cope with new-style --build= specifications

Previously, we would generally bomb out.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
13 months agotest suite: build-modes-*: Provide stunt dpkg-deb to pass -Znone
Ian Jackson [Sun, 26 Aug 2018 11:52:08 +0000 (12:52 +0100)]
test suite: build-modes-*: Provide stunt dpkg-deb to pass -Znone

This speeds it up from about 105 seconds to about 90, on my laptop.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
13 months agotest suite: tstunt debchange: Use exec
Ian Jackson [Sun, 26 Aug 2018 11:42:56 +0000 (12:42 +0100)]
test suite: tstunt debchange: Use exec

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
13 months agotest suite: Test dgit build with bpd
Ian Jackson [Sun, 26 Aug 2018 11:23:01 +0000 (12:23 +0100)]
test suite: Test dgit build with bpd

It's not expected to work.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
13 months agodgit: build: Squash $buildproductsdir
Ian Jackson [Sun, 26 Aug 2018 11:20:44 +0000 (12:20 +0100)]
dgit: build: Squash $buildproductsdir

Things malfunction, because some things end up in .. and some in bpd.
Overriding this at least makes `dgit build' produce correct results,
albeit in the wrong place.

Closes: #906786.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
13 months agotest suite: break out build-modes-source
Ian Jackson [Sun, 26 Aug 2018 11:18:59 +0000 (12:18 +0100)]
test suite: break out build-modes-source

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
13 months agotest suite: build-products-dir: Check nothing in ../
Ian Jackson [Sun, 26 Aug 2018 11:06:31 +0000 (12:06 +0100)]
test suite: build-products-dir: Check nothing in ../

If bpd was set then .. shouldn't have this kind of junk in it.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
13 months agotest suite: sbuild-gitish: Do not use build-products-dir
Ian Jackson [Sun, 26 Aug 2018 12:21:39 +0000 (13:21 +0100)]
test suite: sbuild-gitish: Do not use build-products-dir

The runes in the manpage assume it's not set, and we run sbuild
directly anyway.  We are about to check that nothing ends up in ..
which is not true for this test.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
13 months agogdr-fresh: Honour $bpd
Ian Jackson [Sun, 26 Aug 2018 10:55:52 +0000 (11:55 +0100)]
gdr-fresh: Honour $bpd

Nothing depends on this right now, but I don't want to leave this
latent bug.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
13 months agotest suite: run-all: Understand `:' specially
Ian Jackson [Sun, 26 Aug 2018 10:42:07 +0000 (11:42 +0100)]
test suite: run-all: Understand `:' specially

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
13 months agotest suite: run-all: Move setting of TESTSCRIPTS
Ian Jackson [Sun, 26 Aug 2018 10:41:47 +0000 (11:41 +0100)]
test suite: run-all: Move setting of TESTSCRIPTS

NFC

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
13 months agotest suite: run-all: Honour DGIT_TESTS_TMPDIR
Ian Jackson [Sun, 26 Aug 2018 10:38:57 +0000 (11:38 +0100)]
test suite: run-all: Honour DGIT_TESTS_TMPDIR

If this variable is set, tests/tmp will be made a symlink to a real
subdirectory under $DGIT_TESTS_TMPDIR.  The real subdirectory will be
removed and recreated as tests/tmp would otherwise be.

I set it to
  /run/user/`id -u`/dgit-tests-tmp

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
13 months agotest suite: run-all: Without --progressive, rm and recreate tests/tmp
Ian Jackson [Sun, 26 Aug 2018 10:25:26 +0000 (11:25 +0100)]
test suite: run-all: Without --progressive, rm and recreate tests/tmp

This arranges to rerun tests/setup/ scripts, which wouldn't otherwise
happen; that is IMO a bug.

While we are here, introduce $tmpdir.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
13 months agotest suite: Work if $tmp is on a different filesystem.
Ian Jackson [Sun, 26 Aug 2018 01:41:59 +0000 (02:41 +0100)]
test suite: Work if $tmp is on a different filesystem.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
13 months agotest suite: gdr-makepatches7: use t-make-orig
Ian Jackson [Sun, 26 Aug 2018 00:29:44 +0000 (01:29 +0100)]
test suite: gdr-makepatches7: use t-make-orig

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
13 months agotest suite: gdr-fresh: use t-make-orig
Ian Jackson [Sun, 26 Aug 2018 00:28:12 +0000 (01:28 +0100)]
test suite: gdr-fresh: use t-make-orig

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
13 months agogit-debrebase: t-make-orig: Pass -1 to gzip
Ian Jackson [Sun, 26 Aug 2018 00:19:14 +0000 (01:19 +0100)]
git-debrebase: t-make-orig: Pass -1 to gzip

This makes everything faster.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
13 months agotest suite: lib-gdr: Factor out t-make-orig
Ian Jackson [Sun, 26 Aug 2018 00:18:08 +0000 (01:18 +0100)]
test suite: lib-gdr: Factor out t-make-orig

NFC, overall.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
13 months agodgit-maint-debrebase(7): Add runes for inspecting history
Ian Jackson [Sat, 25 Aug 2018 16:50:57 +0000 (17:50 +0100)]
dgit-maint-debrebase(7): Add runes for inspecting history

I'm not sure if this is the right place but I wanted to publish this
information sooner rather than later.

Closes: #907190.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
13 months agotest suite: gdr-new-upstream: Test updating existing clog entry
Ian Jackson [Sat, 25 Aug 2018 16:40:04 +0000 (17:40 +0100)]
test suite: gdr-new-upstream: Test updating existing clog entry

This is the test case for #905888.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
13 months agogit-debrebase: Use debchange for new-upstream changelog entry
Ian Jackson [Sat, 25 Aug 2018 16:39:32 +0000 (17:39 +0100)]
git-debrebase: Use debchange for new-upstream changelog entry

Closes: #905888.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
13 months agotest suite: Update date to one with nontrivial DST in Europe/London
Ian Jackson [Sat, 25 Aug 2018 16:38:50 +0000 (17:38 +0100)]
test suite: Update date to one with nontrivial DST in Europe/London

This may make more things fail for me if they have timezone bugs.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
13 months agotest suite: debchange: Work around faketime TZ bug
Ian Jackson [Sat, 25 Aug 2018 16:36:52 +0000 (17:36 +0100)]
test suite: debchange: Work around faketime TZ bug

faketime's CLI does not permit correct unparsing of times in arbitrary
timezones.  So we must save and restore TZ.

See #907264.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
13 months agotest suite: debchange: Freeze time
Ian Jackson [Sat, 25 Aug 2018 16:35:51 +0000 (17:35 +0100)]
test suite: debchange: Freeze time

Use faketime's advanced format.  Otherwise if debchange takes too
long, the timestamp generated by debchange is not what we expected.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
13 months agotest suite: dch: Always use tstunt/debchange
Ian Jackson [Sat, 25 Aug 2018 16:21:37 +0000 (17:21 +0100)]
test suite: dch: Always use tstunt/debchange

We are going to make this more sophisticated, so use it everywhere to
avoid duplication.

We need to soup up tstunt/debchange so that it does not depend on
DGIT_TEST_REAL_DEBCHANGE.  If it hasn't been put on the PATH by
t-tstunt, that isn't set, and we can just run debchange from PATH.

This makes faketime a test dependency for all the tests which don't
have NO-DEFAULT.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
13 months agotest suite: gdr-new-upstream: Break out clog-check-[12]
Ian Jackson [Sat, 25 Aug 2018 15:39:24 +0000 (16:39 +0100)]
test suite: gdr-new-upstream: Break out clog-check-[12]

NFC

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
13 months agotest suite: gdr-new-upstream: Use new branch rather than reset
Ian Jackson [Sat, 25 Aug 2018 15:20:00 +0000 (16:20 +0100)]
test suite: gdr-new-upstream: Use new branch rather than reset

This makes it slightly easier to see what's going on, and to extend
the test.

No overall functional change.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
13 months agotest suite: gdr-newupstream: Add more dividers
Ian Jackson [Sat, 25 Aug 2018 15:16:40 +0000 (16:16 +0100)]
test suite: gdr-newupstream: Add more dividers

NFC

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
13 months agogit-debrebase: Prepare for calling debchange
Ian Jackson [Sat, 25 Aug 2018 15:14:23 +0000 (16:14 +0100)]
git-debrebase: Prepare for calling debchange

* Add it to the .deb dependencies
* Add tstunt/debchange to the gdr tests

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
13 months agotest suite: Provide tstunt/debchange
Ian Jackson [Sat, 25 Aug 2018 15:13:35 +0000 (16:13 +0100)]
test suite: Provide tstunt/debchange

This uses faketime to get the date right, like t-dch does.
It has to be requested with t-tstunt debchange, which nothing does
yet, so NFC.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
13 months agotest suite: gdr-new-upstream: Check changelog is exactly right
Ian Jackson [Sat, 25 Aug 2018 15:06:03 +0000 (16:06 +0100)]
test suite: gdr-new-upstream: Check changelog is exactly right

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>