Skip to content
Snippets Groups Projects
Commit d7020b639d7f authored by Pierre-Yves David's avatar Pierre-Yves David :octopus:
Browse files

run: stop being that verbose in lib/before-check.sh

Bash -x mode issue a lot of confusing output, we remove it and issue a bit more
output ourself.

note: the test output work with mercurial up to mercurial-core-ba5b062a1388
(included).
parent 9ce58af675fd
No related branches found
No related tags found
No related merge requests found
......@@ -3,8 +3,8 @@
# Script used to check that the machine is ready for running benchmarks. This
# script assumes that the asv command is in the current PATH
set -eox pipefail
set -eo pipefail
# Ensure asv now machine characteristics
asv machine --yes
......@@ -7,8 +7,9 @@
# Ensure asv now machine characteristics
asv machine --yes
echo check that system is ready for benchmark
echo
echo "check that system is ready for benchmark"
echo "(use ASV_SKIP_SYSTEM_CHECK=1 to skip it)"
if [ -z "${ASV_SKIP_SYSTEM_CHECK:-}" ]; then
......@@ -18,4 +19,5 @@
# Ensure all repository are here
echo "Ensuring we have a mercurial clone handy"
if [ ! -d mercurial ]; then
......@@ -21,5 +23,6 @@
if [ ! -d mercurial ]; then
echo " no Mercurial clone found, making a fresh clone"
hg clone https://www.mercurial-scm.org/repo/hg mercurial --config format.sparse-revlog=no --config format.usegeneraldelta=no --config experimental.evolution.exchange=no
fi
if [ "$SCMPERF_WARMCACHE" != "skip" ] ; then
......@@ -22,7 +25,8 @@
hg clone https://www.mercurial-scm.org/repo/hg mercurial --config format.sparse-revlog=no --config format.usegeneraldelta=no --config experimental.evolution.exchange=no
fi
if [ "$SCMPERF_WARMCACHE" != "skip" ] ; then
echo "preparing cache warming"
# get to the highest revision for future cache warming
if [ -n "$TESTTMP" ]; then
# do a lesser, quicker and quieter version of the setup for tests
......@@ -40,5 +44,7 @@
if [ -e "./local.repos" ]; then
repofiles="./local.repos"
fi
echo "Setting up all target repositories (from $repofiles)"
./script/setup-repos $repofiles ./repos
......@@ -43,5 +49,6 @@
./script/setup-repos $repofiles ./repos
echo "Creating the skip file"
python ./create_skip_file.py
# We prewarm all caches with the latest know mercurial changeset.
......@@ -63,6 +70,8 @@
# of repositories used in scm-perf. This can adds up to a couple of minutes.
if [ "$SCMPERF_WARMCACHE" != "skip" ] ; then
echo "Warming caches for all repos"
echo "(use SCMPERF_WARMCACHE=skip to skip it)"
starttime=`date +%s`
for r in repos/*/.hg repos/partial-references/*/.hg; do
r="`dirname $r`"
......
......@@ -116,7 +116,6 @@
partial reference: same
downloading repo
$ ASV_SKIP_SYSTEM_CHECK=1 $PYTHON ./launch.py -q fe3ca1e6 -b track_commit --no-pull
+ asv machine --yes
* (glob)
* (glob)
* (glob)
......@@ -137,5 +136,5 @@
* (glob)
* (glob)
* (glob)
*: + echo check that system is ready for benchmark (glob)
* (glob)
check that system is ready for benchmark
......@@ -141,3 +140,2 @@
check that system is ready for benchmark
+ echo '(use ASV_SKIP_SYSTEM_CHECK=1 to skip it)'
(use ASV_SKIP_SYSTEM_CHECK=1 to skip it)
......@@ -143,6 +141,4 @@
(use ASV_SKIP_SYSTEM_CHECK=1 to skip it)
+ '[' -z 1 ']'
+ hg clone https://www.mercurial-scm.org/repo/hg mercurial (?)
requesting all changes (?)
adding changesets (?)
adding manifests (?)
......@@ -151,18 +147,10 @@
updating to bookmark @* (glob) (?)
new changesets * (glob) (?)
* files updated, 0 files merged, 0 files removed, 0 files unresolved (glob) (?)
+ '[' '!' -d mercurial ']'
+ hg clone https://www.mercurial-scm.org/repo/hg mercurial --config format.sparse-revlog=no --config format.usegeneraldelta=no --config experimental.evolution.exchange=no
+ '[' '' '!=' skip ']'
+ '[' -n $TESTTMP ']'
+ cd mercurial
+ unset HGWITHRUSTEXT
+ make clean --silent
+ make local --silent 'PURE=--pure --quiet'
+ repofiles=./default.repos
+ '[' -e ./local.repos ']'
+ repofiles=./local.repos
+ ./script/setup-repos ./local.repos ./repos
Ensuring we have a mercurial clone handy
no Mercurial clone found, making a fresh clone
preparing cache warming
Setting up all target repositories (from ./local.repos)
2 repositories to setup in $TESTTMP/test-asv/repos
Setting up reference repository: smoke-test-A-1a246934
main reference
......@@ -186,12 +174,7 @@
already up to date
partial reference: same
already up to date
+ python ./create_skip_file.py
+ '[' '' '!=' skip ']'
++ date +%s
+ starttime=* (glob)
+ for r in repos/*/.hg repos/partial-references/*/.hg
++ dirname repos/smoke-test-A-1a246934-reference/.hg
+ r=repos/smoke-test-A-1a246934-reference
+ echo checking caches for: repos/smoke-test-A-1a246934-reference
Creating the skip file
Warming caches for all repos
(use SCMPERF_WARMCACHE=skip to skip it)
checking caches for: repos/smoke-test-A-1a246934-reference
......@@ -197,8 +180,2 @@
checking caches for: repos/smoke-test-A-1a246934-reference
+ HGRCPATH=
+ mercurial/hg -R repos/smoke-test-A-1a246934-reference debugupdatecache
+ for r in repos/*/.hg repos/partial-references/*/.hg
++ dirname repos/smoke-test-B-744eedfb-reference/.hg
+ r=repos/smoke-test-B-744eedfb-reference
+ echo checking caches for: repos/smoke-test-B-744eedfb-reference
checking caches for: repos/smoke-test-B-744eedfb-reference
......@@ -204,8 +181,2 @@
checking caches for: repos/smoke-test-B-744eedfb-reference
+ HGRCPATH=
+ mercurial/hg -R repos/smoke-test-B-744eedfb-reference debugupdatecache
+ for r in repos/*/.hg repos/partial-references/*/.hg
++ dirname repos/partial-references/smoke-test-A-1a246934-partial-last-hundred/.hg
+ r=repos/partial-references/smoke-test-A-1a246934-partial-last-hundred
+ echo checking caches for: repos/partial-references/smoke-test-A-1a246934-partial-last-hundred
checking caches for: repos/partial-references/smoke-test-A-1a246934-partial-last-hundred
......@@ -211,8 +182,2 @@
checking caches for: repos/partial-references/smoke-test-A-1a246934-partial-last-hundred
+ HGRCPATH=
+ mercurial/hg -R repos/partial-references/smoke-test-A-1a246934-partial-last-hundred debugupdatecache
+ for r in repos/*/.hg repos/partial-references/*/.hg
++ dirname repos/partial-references/smoke-test-A-1a246934-partial-last-ten/.hg
+ r=repos/partial-references/smoke-test-A-1a246934-partial-last-ten
+ echo checking caches for: repos/partial-references/smoke-test-A-1a246934-partial-last-ten
checking caches for: repos/partial-references/smoke-test-A-1a246934-partial-last-ten
......@@ -218,8 +183,2 @@
checking caches for: repos/partial-references/smoke-test-A-1a246934-partial-last-ten
+ HGRCPATH=
+ mercurial/hg -R repos/partial-references/smoke-test-A-1a246934-partial-last-ten debugupdatecache
+ for r in repos/*/.hg repos/partial-references/*/.hg
++ dirname repos/partial-references/smoke-test-A-1a246934-partial-last-thousand/.hg
+ r=repos/partial-references/smoke-test-A-1a246934-partial-last-thousand
+ echo checking caches for: repos/partial-references/smoke-test-A-1a246934-partial-last-thousand
checking caches for: repos/partial-references/smoke-test-A-1a246934-partial-last-thousand
......@@ -225,8 +184,2 @@
checking caches for: repos/partial-references/smoke-test-A-1a246934-partial-last-thousand
+ HGRCPATH=
+ mercurial/hg -R repos/partial-references/smoke-test-A-1a246934-partial-last-thousand debugupdatecache
+ for r in repos/*/.hg repos/partial-references/*/.hg
++ dirname repos/partial-references/smoke-test-A-1a246934-partial-same/.hg
+ r=repos/partial-references/smoke-test-A-1a246934-partial-same
+ echo checking caches for: repos/partial-references/smoke-test-A-1a246934-partial-same
checking caches for: repos/partial-references/smoke-test-A-1a246934-partial-same
......@@ -232,8 +185,2 @@
checking caches for: repos/partial-references/smoke-test-A-1a246934-partial-same
+ HGRCPATH=
+ mercurial/hg -R repos/partial-references/smoke-test-A-1a246934-partial-same debugupdatecache
+ for r in repos/*/.hg repos/partial-references/*/.hg
++ dirname repos/partial-references/smoke-test-B-744eedfb-partial-last-hundred/.hg
+ r=repos/partial-references/smoke-test-B-744eedfb-partial-last-hundred
+ echo checking caches for: repos/partial-references/smoke-test-B-744eedfb-partial-last-hundred
checking caches for: repos/partial-references/smoke-test-B-744eedfb-partial-last-hundred
......@@ -239,8 +186,2 @@
checking caches for: repos/partial-references/smoke-test-B-744eedfb-partial-last-hundred
+ HGRCPATH=
+ mercurial/hg -R repos/partial-references/smoke-test-B-744eedfb-partial-last-hundred debugupdatecache
+ for r in repos/*/.hg repos/partial-references/*/.hg
++ dirname repos/partial-references/smoke-test-B-744eedfb-partial-last-ten/.hg
+ r=repos/partial-references/smoke-test-B-744eedfb-partial-last-ten
+ echo checking caches for: repos/partial-references/smoke-test-B-744eedfb-partial-last-ten
checking caches for: repos/partial-references/smoke-test-B-744eedfb-partial-last-ten
......@@ -246,8 +187,2 @@
checking caches for: repos/partial-references/smoke-test-B-744eedfb-partial-last-ten
+ HGRCPATH=
+ mercurial/hg -R repos/partial-references/smoke-test-B-744eedfb-partial-last-ten debugupdatecache
+ for r in repos/*/.hg repos/partial-references/*/.hg
++ dirname repos/partial-references/smoke-test-B-744eedfb-partial-last-thousand/.hg
+ r=repos/partial-references/smoke-test-B-744eedfb-partial-last-thousand
+ echo checking caches for: repos/partial-references/smoke-test-B-744eedfb-partial-last-thousand
checking caches for: repos/partial-references/smoke-test-B-744eedfb-partial-last-thousand
......@@ -253,8 +188,2 @@
checking caches for: repos/partial-references/smoke-test-B-744eedfb-partial-last-thousand
+ HGRCPATH=
+ mercurial/hg -R repos/partial-references/smoke-test-B-744eedfb-partial-last-thousand debugupdatecache
+ for r in repos/*/.hg repos/partial-references/*/.hg
++ dirname repos/partial-references/smoke-test-B-744eedfb-partial-same/.hg
+ r=repos/partial-references/smoke-test-B-744eedfb-partial-same
+ echo checking caches for: repos/partial-references/smoke-test-B-744eedfb-partial-same
checking caches for: repos/partial-references/smoke-test-B-744eedfb-partial-same
......@@ -260,8 +189,2 @@
checking caches for: repos/partial-references/smoke-test-B-744eedfb-partial-same
+ HGRCPATH=
+ mercurial/hg -R repos/partial-references/smoke-test-B-744eedfb-partial-same debugupdatecache
++ date +%s
+ endtime=* (glob)
++ expr * - * (glob)
+ echo warming cache took * seconds (glob)
warming cache took * seconds (glob)
......@@ -267,5 +190,4 @@
warming cache took * seconds (glob)
- Fetching recent changes
- Creating environments
- Discovering benchmarks
-- Uninstalling from virtualenv-py2.7-pyyaml-HGMODULEPOLICYrust+c (?)
......@@ -298,7 +220,7 @@
============== ========================= =============================== ======================= ===================== ========================== ============================ ====================== ========================== ======== =====================
+ ['./lib/before-check.sh']
+ ['asv', 'run', '--launch-method', 'spawn', '--skip-existing-successful', 'fe3ca1e6', '-b', 'track_commit']
+ ['asv', 'run', '--launch-method', 'spawn', '--skip-existing-successful', 'fe3ca1e6', '-b', 'track_commit', '--no-pull']
check the repos directory afterwards
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment