##// END OF EJS Templates
resolve: fix incorrect merge...
resolve: fix incorrect merge The merge from stable into default was semantically incomplete -- a couple of changes in preceding code had to be rewritten here. This code only triggers for change/delete conflicts, so we can't test it yet. We will soon be able to do it, though.

File last commit:

r26148:7f49efca default
r27025:ec372573 default
Show More
test-docker-packaging.t
27 lines | 895 B | text/troff | Tads3Lexer
/ tests / test-docker-packaging.t
Augie Fackler
test-docker-packaging: test packages built using docker...
r26146 #require test-repo slow docker
Augie Fackler
debian: switch to using debhelper and dh_python2 to build debs...
r26148 Ensure debuild doesn't run the testsuite, as that could get silly.
$ DEB_BUILD_OPTIONS=nocheck
$ export DEB_BUILD_OPTIONS
Augie Fackler
test-docker-packaging: test packages built using docker...
r26146 $ OUTPUTDIR=`pwd`
$ export OUTPUTDIR
$ cd "$TESTDIR"/..
$ make docker-debian-jessie > $OUTPUTDIR/build.log 2>&1
$ cd $OUTPUTDIR
$ ls *.deb
Augie Fackler
debian: switch to using debhelper and dh_python2 to build debs...
r26148 mercurial-common_*.deb (glob)
mercurial_*.deb (glob)
Augie Fackler
test-docker-packaging: test packages built using docker...
r26146
We check debian package contents with portable tools so that when
we're on non-debian machines we can still test the packages that are
built using docker.
Augie Fackler
debian: switch to using debhelper and dh_python2 to build debs...
r26148
main deb should have .so but no .py
$ ar x mercurial_*.deb
$ tar tf data.tar* | egrep '(localrepo|parsers)'
./usr/lib/python2.7/dist-packages/mercurial/parsers*.so (glob)
mercurial-common should have .py but no .so or .pyc
$ ar x mercurial-common_*.deb
$ tar tf data.tar* | egrep '(localrepo|parsers)'
./usr/lib/python2.7/dist-packages/mercurial/localrepo.py