tests/test-docker-packaging.t
author Martin von Zweigbergk <martinvonz@google.com>
Sat, 12 Dec 2015 09:57:05 -0800
changeset 27343 c59647c6694d
parent 26148 7f49efcaa9b4
child 28973 fc0f9714d077
permissions -rw-r--r--
treemanifest: don't iterate entire matching submanifests on match() Before 2773540c3650 (match: remove unnecessary optimization where visitdir() returns 'all', 2015-05-06), match.visitdir() used to return the special value 'all' to indicate that it was known that all subdirectories would also be included in the match. The purpose for that value was to avoid calling the matcher on all the paths. It turned out that calling the matcher was not a problem, so the special return value was removed and the code was simplified. However, if we use the same special value for not just avoiding calling the matcher on each file, but to avoid iterating over each file, it's a much bigger win. On commands like hg st --rev .^ --rev . dom/ we run the matcher (dom/) on the two manifests, then diff the narrowed manifest. If the size of the match is much larger than the size of the diff, this is wasteful. In the above case, we would end up iterating over the 15k-or-so files in dom/ for each of the manifests, only to later discover that they are mostly the same. This means that runningt the command above is usually slower than getting the status for the entire repo, because that code avoids calling treemanifest.match() and only calls treemanifest.diff(), which loads only what's needed for the diff. Let's fix this by reintroducing the 'all' value in match.visitdir() and making treemanifest.match() return a lazy copy of the manifest from dom/ and down (in the above case). This speeds up the above command on the Firefox repo from 0.357s to 0.137s (best of 5). The wider the match, the bigger the speedup.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
26146
8c91726caeae test-docker-packaging: test packages built using docker
Augie Fackler <augie@google.com>
parents:
diff changeset
     1
#require test-repo slow docker
8c91726caeae test-docker-packaging: test packages built using docker
Augie Fackler <augie@google.com>
parents:
diff changeset
     2
26148
7f49efcaa9b4 debian: switch to using debhelper and dh_python2 to build debs
Augie Fackler <augie@google.com>
parents: 26146
diff changeset
     3
Ensure debuild doesn't run the testsuite, as that could get silly.
7f49efcaa9b4 debian: switch to using debhelper and dh_python2 to build debs
Augie Fackler <augie@google.com>
parents: 26146
diff changeset
     4
  $ DEB_BUILD_OPTIONS=nocheck
7f49efcaa9b4 debian: switch to using debhelper and dh_python2 to build debs
Augie Fackler <augie@google.com>
parents: 26146
diff changeset
     5
  $ export DEB_BUILD_OPTIONS
26146
8c91726caeae test-docker-packaging: test packages built using docker
Augie Fackler <augie@google.com>
parents:
diff changeset
     6
  $ OUTPUTDIR=`pwd`
8c91726caeae test-docker-packaging: test packages built using docker
Augie Fackler <augie@google.com>
parents:
diff changeset
     7
  $ export OUTPUTDIR
8c91726caeae test-docker-packaging: test packages built using docker
Augie Fackler <augie@google.com>
parents:
diff changeset
     8
8c91726caeae test-docker-packaging: test packages built using docker
Augie Fackler <augie@google.com>
parents:
diff changeset
     9
  $ cd "$TESTDIR"/..
8c91726caeae test-docker-packaging: test packages built using docker
Augie Fackler <augie@google.com>
parents:
diff changeset
    10
  $ make docker-debian-jessie > $OUTPUTDIR/build.log 2>&1
8c91726caeae test-docker-packaging: test packages built using docker
Augie Fackler <augie@google.com>
parents:
diff changeset
    11
  $ cd $OUTPUTDIR
8c91726caeae test-docker-packaging: test packages built using docker
Augie Fackler <augie@google.com>
parents:
diff changeset
    12
  $ ls *.deb
26148
7f49efcaa9b4 debian: switch to using debhelper and dh_python2 to build debs
Augie Fackler <augie@google.com>
parents: 26146
diff changeset
    13
  mercurial-common_*.deb (glob)
7f49efcaa9b4 debian: switch to using debhelper and dh_python2 to build debs
Augie Fackler <augie@google.com>
parents: 26146
diff changeset
    14
  mercurial_*.deb (glob)
26146
8c91726caeae test-docker-packaging: test packages built using docker
Augie Fackler <augie@google.com>
parents:
diff changeset
    15
8c91726caeae test-docker-packaging: test packages built using docker
Augie Fackler <augie@google.com>
parents:
diff changeset
    16
We check debian package contents with portable tools so that when
8c91726caeae test-docker-packaging: test packages built using docker
Augie Fackler <augie@google.com>
parents:
diff changeset
    17
we're on non-debian machines we can still test the packages that are
8c91726caeae test-docker-packaging: test packages built using docker
Augie Fackler <augie@google.com>
parents:
diff changeset
    18
built using docker.
26148
7f49efcaa9b4 debian: switch to using debhelper and dh_python2 to build debs
Augie Fackler <augie@google.com>
parents: 26146
diff changeset
    19
7f49efcaa9b4 debian: switch to using debhelper and dh_python2 to build debs
Augie Fackler <augie@google.com>
parents: 26146
diff changeset
    20
main deb should have .so but no .py
7f49efcaa9b4 debian: switch to using debhelper and dh_python2 to build debs
Augie Fackler <augie@google.com>
parents: 26146
diff changeset
    21
  $ ar x mercurial_*.deb
7f49efcaa9b4 debian: switch to using debhelper and dh_python2 to build debs
Augie Fackler <augie@google.com>
parents: 26146
diff changeset
    22
  $ tar tf data.tar* | egrep '(localrepo|parsers)'
7f49efcaa9b4 debian: switch to using debhelper and dh_python2 to build debs
Augie Fackler <augie@google.com>
parents: 26146
diff changeset
    23
  ./usr/lib/python2.7/dist-packages/mercurial/parsers*.so (glob)
7f49efcaa9b4 debian: switch to using debhelper and dh_python2 to build debs
Augie Fackler <augie@google.com>
parents: 26146
diff changeset
    24
mercurial-common should have .py but no .so or .pyc
7f49efcaa9b4 debian: switch to using debhelper and dh_python2 to build debs
Augie Fackler <augie@google.com>
parents: 26146
diff changeset
    25
  $ ar x mercurial-common_*.deb
7f49efcaa9b4 debian: switch to using debhelper and dh_python2 to build debs
Augie Fackler <augie@google.com>
parents: 26146
diff changeset
    26
  $ tar tf data.tar* | egrep '(localrepo|parsers)'
7f49efcaa9b4 debian: switch to using debhelper and dh_python2 to build debs
Augie Fackler <augie@google.com>
parents: 26146
diff changeset
    27
  ./usr/lib/python2.7/dist-packages/mercurial/localrepo.py