Skip to content
Snippets Groups Projects
Commit 70e85798 authored by Raphaël Gomès's avatar Raphaël Gomès
Browse files

tests: use $PYTHON instead of system python version to make scripts use venv

Forgetting to use $PYTHON and just calling the script as an executable will
make it use the system version of python instead of the one running the tests,
which has very little chance of a) being the right version and b) having the
right packages installed.
parent 1f60a4e7
No related branches found
No related tags found
No related merge requests found
......@@ -89,7 +89,7 @@
> EOF
$ export HGRCPATH="${TESTTMP}"/test-asv/test.hgrc
$ ./script/setup-repos default.repos repos "file://$TESTTMP/references/"
$ $PYTHON ./script/setup-repos default.repos repos "file://$TESTTMP/references/"
2 repositories to setup in $TESTTMP/test-asv/repos
Setting up reference repository: smoke-test-A-11eb1fef
main reference
......@@ -115,7 +115,7 @@
downloading repo
partial reference: same
downloading repo
$ ASV_SKIP_SYSTEM_CHECK=1 ./launch.py -q fe3ca1e6 -b track_commit
$ ASV_SKIP_SYSTEM_CHECK=1 $PYTHON ./launch.py -q fe3ca1e6 -b track_commit
+ asv machine --yes
* (glob)
* (glob)
......@@ -153,8 +153,9 @@
* files updated, 0 files merged, 0 files removed, 0 files unresolved (glob) (?)
+ '[' '!' -d mercurial ']'
+ hg clone https://www.mercurial-scm.org/repo/hg mercurial
+ '[' '' '!=' skip ']'
+ '[' -n $TESTTMP ']'
+ cd mercurial
+ unset HGWITHRUSTEXT
+ make clean --silent
+ make local --silent 'PURE=--pure --quiet'
......@@ -156,8 +157,10 @@
+ '[' -n $TESTTMP ']'
+ cd mercurial
+ unset HGWITHRUSTEXT
+ make clean --silent
+ make local --silent 'PURE=--pure --quiet'
+ repofiles=./default.repos
+ '[' -e ./local.repos ']'
+ ./script/setup-repos ./default.repos ./repos
2 repositories to setup in $TESTTMP/test-asv/repos
Setting up reference repository: smoke-test-A-11eb1fef
......@@ -183,6 +186,7 @@
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
......@@ -269,7 +273,7 @@
- Running 1 total benchmarks (1 commits * 1 environments * 1 benchmarks)
[ 0.00%] - For mercurial commit fe3ca1e6:
[ 0.00%] -- Benchmarking virtualenv-py2.7-pyyaml
[100.00%] --- Setting up utils.py:* ok (glob)
[100.00%] --- Setting up utils:* ok (glob)
[100.00%] --- basic_commands.TestSuite.track_commit ok
[100.00%] --- ============== ========================= =============================== ======================= ===================== ========================== ============================ ========================== ======== =====================
repo repo-format-compression repo-format-compression-level repo-format-dotencode repo-format-fncache repo-format-generaldelta repo-format-plain-cl-delta repo-format-sparserevlog mode
......@@ -290,7 +294,7 @@
[ 88.89%] - Generating output for Regressions
[100.00%] - Writing index
+ ['./lib/before-check.sh']
+ ['taskset', '-c', '2,3', 'asv', 'run', '--launch-method', 'spawn', '--skip-existing-successful', 'fe3ca1e6', '-b', 'track_commit']
+ ['asv', 'run', '--launch-method', 'spawn', '--skip-existing-successful', 'fe3ca1e6', '-b', 'track_commit']
+ ['asv', 'publish', '--no-pull']
......
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