Mercurial Mercurial > hg / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
contrib/vagrant/run-tests.sh
author Martin von Zweigbergk <martinvonz@google.com>
Tue, 10 Feb 2015 16:17:15 -0800
changeset 24121 9d0b6ef92eb2
parent 21874 8da01b6e7b49
permissions -rw-r--r--
test-merge-tools: fix flaky test by avoiding debugsetparents debugsetparents is a debug command and does not provide the same guarantees as non-debug commands do. In particular, when the user sets a different parent, any clean files will remain clean in the dirstate even though the new parent might have a different version of the file (so it should appear modified compared to the new parent). Let's instead achieve the same effect by updating to the new parent and reverting the contents back to what they were. This fix can be tested by passing '--config debug.dirstate.delaywrite=2' to the 'hg update' command in the beforemerge().
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
21874
8da01b6e7b49 contrib/vagrant: use Vagrant for running tests on virtual machine
anatoly techtonik <techtonik@gmail.com>
parents:
diff changeset 
     1
 
#!/bin/sh
8da01b6e7b49 contrib/vagrant: use Vagrant for running tests on virtual machine
anatoly techtonik <techtonik@gmail.com>
parents:
diff changeset 
     2
 
# This scripts is used to setup temp directory in memory
8da01b6e7b49 contrib/vagrant: use Vagrant for running tests on virtual machine
anatoly techtonik <techtonik@gmail.com>
parents:
diff changeset 
     3
 
# for running Mercurial tests in vritual machine managed
8da01b6e7b49 contrib/vagrant: use Vagrant for running tests on virtual machine
anatoly techtonik <techtonik@gmail.com>
parents:
diff changeset 
     4
 
# by Vagrant (see Vagrantfile for details).
8da01b6e7b49 contrib/vagrant: use Vagrant for running tests on virtual machine
anatoly techtonik <techtonik@gmail.com>
parents:
diff changeset 
     5
 












8da01b6e7b49
contrib/vagrant: use Vagrant for running tests on virtual machine



anatoly techtonik <techtonik@gmail.com>


parents: 

diff
changeset




     6


cd /hgshared













8da01b6e7b49
contrib/vagrant: use Vagrant for running tests on virtual machine



anatoly techtonik <techtonik@gmail.com>


parents: 

diff
changeset




     7


make local













8da01b6e7b49
contrib/vagrant: use Vagrant for running tests on virtual machine



anatoly techtonik <techtonik@gmail.com>


parents: 

diff
changeset




     8


cd tests













8da01b6e7b49
contrib/vagrant: use Vagrant for running tests on virtual machine



anatoly techtonik <techtonik@gmail.com>


parents: 

diff
changeset




     9


mkdir /tmp/ram













8da01b6e7b49
contrib/vagrant: use Vagrant for running tests on virtual machine



anatoly techtonik <techtonik@gmail.com>


parents: 

diff
changeset




    10


sudo mount -t tmpfs -o size=100M tmpfs /tmp/ram













8da01b6e7b49
contrib/vagrant: use Vagrant for running tests on virtual machine



anatoly techtonik <techtonik@gmail.com>


parents: 

diff
changeset




    11


export TMPDIR=/tmp/ram













8da01b6e7b49
contrib/vagrant: use Vagrant for running tests on virtual machine



anatoly techtonik <techtonik@gmail.com>


parents: 

diff
changeset




    12


./run-tests.py -l --time













8da01b6e7b49
contrib/vagrant: use Vagrant for running tests on virtual machine



anatoly techtonik <techtonik@gmail.com>


parents: 

diff
changeset




    13
















Mercurial