| Commit message (Collapse) | Author | Age |
|
|
|
|
|
|
| |
Manually move just the .orig from the bpd to `..'. Then check that
when we are done they are (links to) the same file.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
| |
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
If we might be doing quilt fixup, then the quilt fixup's attempt to
merge back into master might fail if there are uncommitted
debian/patches. So it is sometimes wrong to just not clean at all.
We don't want the behaviour to depend on the source package format,
and ideally not on the clean mode.
Also, the user may have forgotten to `git add', in which case they
will thank us for spotting their mistake.
In the original design table in
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=910705#56
says this for this case
/: disregarded
would be fine to delete but
** better to trip ? **
** want opt to disregard **
but this was not implemented at the time.
So implement that now.
I think I have concluded that with -wg and -wgf the right way to turn
these new failures into successes is to have a way to have the clean
actually done. If that is not wanted, one can say -wn instead.
This is particularly true given that ignoring the problem can produce
confusing failure, as seen in #914317.
So there will be a new --clean=git[-ff],always shortly.
Closes: #914317
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
|
|
| |
This test setup facility passed a dirty working tree to all of its
consumers. That was not really intended or useful, and is about to
start causing trouble.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
|
|
|
|
|
| |
This will break with older versions of pbuilder and cowbuilder,
unfortunately. That breakage can be worked around by passing dgit one
or both of the new options:
--pbuilder!:--no-source-only-changes
--cowbuilder!:--no-source-only-changes
Closes: #904862.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
| |
The failure to do this was simply a bug.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
| |
Suggested-by: Colin Watson <cjwatson@chiark.greenend.org.uk>
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
|
|
|
| |
Things are not likely to work otherwise.
(If someone wants to try to run dgit in another ctype then I think
things will mostly work...)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
|
|
|
|
| |
We have plenty of other places where we used -wddn or ,no-check.
Here we have an opportunity to test -wdda: create a ~ file (which
would be ignored), clean everything else, and check that -wdda fails
but the default (-wdd) succeds.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
|
|
|
| |
These have been here since these test was created. I think this must
have been done by copying the example of some other tests - but those
other tests didn't use the `example' test package and actually needed
it. `example' does not.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
|
|
| |
We've dealt with all the cases now, so we can add the default.
Also, in the test suite.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
|
| |
Handle this explicitly in the clean_tree_check conditional and in the
test suite.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
|
| |
Document this, and handle it explicitly in the clean_tree_check
conditional and in the test suite.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
| |
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
We would like to spot if the user forgot to `git add' a file.
This can be done by calling clean_tree_check_git, after rules
clean (if applicable).
We need to make this configurable. We do so via the clean mode, with
a comma-separated checking control suffix (and short aliases) like we
did for --clean=git,ignores.
The default should be cautious, ie to do this check, but often the
user will want to disable it because the source package has a buggy
clean target or no or insufficient .gitignore. Existing users should
probably get the new check until they choose otherwise (which we have
made easier for them with the .clean-mode-newer config option).
So we change the meanings of -wd and -wdd to include the new check,
and provide new build modes ...,no-check aka -wdn / -wddn to disable
it.
To implement this we introduce a new clean_tree_check_git_wd function
to do the actual work, particularly because both during cleaning and
cleanliness checking, we want to print some hints to the user if the
check fails.
We can't do the new check if we applied patches dirtily to run the
rules target, because it will trip over the result of patch
application. This way of working is just too poor to support this new
check.
The test suite generally tests the default versions, not the no-check
versions. We must teach the test to expect the new check. This is
most easily done with a separate case for the check side of the -wd
clean modes. And we need to support the no-check variant too,
because:
The push-source-with-changes test does in fact work with a built tree
and needs to test the no-check variant.
The gbp tests sometimes involve patch application. Rather than trying
to predict which of them do (in which cases there would be no clean
check), we force them all to ,no-check.
The oldnewtagalt test can use -wgf.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
| |
Nothing sets this now so NFC.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
|
|
| |
This will make forthcoming change a less disruptive diff.
No functional change.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
|
|
| |
This will make it easier to make the command vary.
No functional change.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This part of the fix for #910705. This makes -wc actually work with
build_source.
But per the discussion in #910705 we want to implement some checking
in dpkg-source[-d] mode too.
We need to teach the test suite about this notion of checking
cleanlines rather than cleaning. For now we wildcard C*.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
| |
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
|
|
|
|
|
| |
dgit should treat git-debrebase not existing the same way as it
exiting 7 (which in fact, is the same way it treats it succeeding).
We are going to fix that. But first we need to make this test case
not expect dgit to break in this situation. To test dgit with an
actually *broken* git-debrebase, we specify `false' instead.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
| |
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
| |
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
| |
This is filtered out of debian/tests/control, but honoured in-tree.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
| |
No users yet so NFC.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
| |
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
| |
This speeds it up from about 105 seconds to about 90, on my laptop.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
| |
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
| |
It's not expected to work.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
| |
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
| |
If bpd was set then .. shouldn't have this kind of junk in it.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
| |
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>
|
|
|
|
| |
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
| |
NFC
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
| |
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
| |
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
| |
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
| |
This makes everything faster.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
| |
NFC, overall.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
| |
This is the test case for #905888.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
| |
Closes: #905888.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
| |
This may make more things fail for me if they have timezone bugs.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
| |
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>
|