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

setup-repos: use the new script in the standard setup

parent b117eb61c67c
No related branches found
No related tags found
No related merge requests found
...@@ -22,7 +22,5 @@ ...@@ -22,7 +22,5 @@
hg clone https://www.mercurial-scm.org/repo/hg mercurial hg clone https://www.mercurial-scm.org/repo/hg mercurial
fi fi
mkdir -p repos/ ./script/setup-repos ./default.repos ./repos
mkdir -p repos/partial-references
make MAKE_VERBOSE=1 -f repos.make
...@@ -28,2 +26,2 @@ ...@@ -28,2 +26,2 @@
python create_skip_file.py python ./create_skip_file.py
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
refdata = read_yaml(refpath) refdata = read_yaml(refpath)
partial_sets = refdata.get("partial-sets") partial_sets = refdata.get("partial-sets")
if partial_sets is None: if partial_sets is None:
msg = "not partials-sets declared: %s" % refdata msg = "not partial-sets declared: %s" % refpath
raise SetupError(msg) raise SetupError(msg)
for variant in sorted(partial_sets): for variant in sorted(partial_sets):
......
...@@ -57,22 +57,10 @@ ...@@ -57,22 +57,10 @@
$ rsync --exclude 'repos' --exclude 'mercurial' -ra $TESTDIR/.. test-asv $ rsync --exclude 'repos' --exclude 'mercurial' -ra $TESTDIR/.. test-asv
$ cd test-asv $ cd test-asv
$ cat << EOF > repos.make $ cat << EOF > default.repos
> SOURCE="$TESTTMP/references" > smoke-test-A-11eb1fef
> all: repos/smoke-test-A-11eb1fef.benchrepo repos/smoke-test-B-4324509a.benchrepo > # (second copy of the same repo, for testing)
> > smoke-test-B-4324509a
> repos/smoke-test-A-11eb1fef.benchrepo:
> (cd repos; tar xf \$(SOURCE)/smoke-test-A-11eb1fef-reference.tar --warning=no-timestamp; hg -R smoke-test-A-11eb1fef-reference update --quiet tip)
> (cd repos/partial-references/; tar xf \$(SOURCE)/smoke-test-A-11eb1fef-partial-last-hundred.tar --warning=no-timestamp )
> (cd repos/partial-references/; tar xf \$(SOURCE)/smoke-test-A-11eb1fef-partial-last-ten.tar --warning=no-timestamp )
> (cd repos/partial-references/; tar xf \$(SOURCE)/smoke-test-A-11eb1fef-partial-last-thousand.tar --warning=no-timestamp )
> (cd repos/partial-references/; tar xf \$(SOURCE)/smoke-test-A-11eb1fef-partial-same.tar --warning=no-timestamp )
> repos/smoke-test-B-4324509a.benchrepo:
> (cd repos; tar xf \$(SOURCE)/smoke-test-B-4324509a-reference.tar --warning=no-timestamp; hg -R smoke-test-B-4324509a-reference update --quiet tip)
> (cd repos/partial-references/; tar xf \$(SOURCE)/smoke-test-B-4324509a-partial-last-hundred.tar --warning=no-timestamp )
> (cd repos/partial-references/; tar xf \$(SOURCE)/smoke-test-B-4324509a-partial-last-ten.tar --warning=no-timestamp )
> (cd repos/partial-references/; tar xf \$(SOURCE)/smoke-test-B-4324509a-partial-last-thousand.tar --warning=no-timestamp )
> (cd repos/partial-references/; tar xf \$(SOURCE)/smoke-test-B-4324509a-partial-same.tar --warning=no-timestamp )
> EOF > EOF
setup appropriate virtual env setup appropriate virtual env
...@@ -101,6 +89,32 @@ ...@@ -101,6 +89,32 @@
> EOF > EOF
$ export HGRCPATH="${TESTTMP}"/test-asv/test.hgrc $ export HGRCPATH="${TESTTMP}"/test-asv/test.hgrc
$ ./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
downloading repo
updating repo
partial reference: last-hundred
downloading repo
partial reference: last-ten
downloading repo
partial reference: last-thousand
downloading repo
partial reference: same
downloading repo
Setting up reference repository: smoke-test-B-4324509a
main reference
downloading repo
updating repo
partial reference: last-hundred
downloading repo
partial reference: last-ten
downloading repo
partial reference: last-thousand
downloading repo
partial reference: same
downloading repo
$ ASV_SKIP_SYSTEM_CHECK=1 ./launch.py -q fe3ca1e6 -b track_commit $ ASV_SKIP_SYSTEM_CHECK=1 ./launch.py -q fe3ca1e6 -b track_commit
+ asv machine --yes + asv machine --yes
* (glob) * (glob)
...@@ -139,20 +153,31 @@ ...@@ -139,20 +153,31 @@
* files updated, 0 files merged, 0 files removed, 0 files unresolved (glob) (?) * files updated, 0 files merged, 0 files removed, 0 files unresolved (glob) (?)
+ '[' '!' -d mercurial ']' + '[' '!' -d mercurial ']'
+ hg clone https://www.mercurial-scm.org/repo/hg mercurial + hg clone https://www.mercurial-scm.org/repo/hg mercurial
+ mkdir -p repos/ + ./script/setup-repos ./default.repos ./repos
+ mkdir -p repos/partial-references 2 repositories to setup in $TESTTMP/test-asv/repos
+ make MAKE_VERBOSE=1 -f repos.make Setting up reference repository: smoke-test-A-11eb1fef
(cd repos; tar xf "$TESTTMP/references"/smoke-test-A-11eb1fef-reference.tar --warning=no-timestamp; hg -R smoke-test-A-11eb1fef-reference update --quiet tip) main reference
(cd repos/partial-references/; tar xf "$TESTTMP/references"/smoke-test-A-11eb1fef-partial-last-hundred.tar --warning=no-timestamp ) already up to date
(cd repos/partial-references/; tar xf "$TESTTMP/references"/smoke-test-A-11eb1fef-partial-last-ten.tar --warning=no-timestamp ) partial reference: last-hundred
(cd repos/partial-references/; tar xf "$TESTTMP/references"/smoke-test-A-11eb1fef-partial-last-thousand.tar --warning=no-timestamp ) already up to date
(cd repos/partial-references/; tar xf "$TESTTMP/references"/smoke-test-A-11eb1fef-partial-same.tar --warning=no-timestamp ) partial reference: last-ten
(cd repos; tar xf "$TESTTMP/references"/smoke-test-B-4324509a-reference.tar --warning=no-timestamp; hg -R smoke-test-B-4324509a-reference update --quiet tip) already up to date
(cd repos/partial-references/; tar xf "$TESTTMP/references"/smoke-test-B-4324509a-partial-last-hundred.tar --warning=no-timestamp ) partial reference: last-thousand
(cd repos/partial-references/; tar xf "$TESTTMP/references"/smoke-test-B-4324509a-partial-last-ten.tar --warning=no-timestamp ) already up to date
(cd repos/partial-references/; tar xf "$TESTTMP/references"/smoke-test-B-4324509a-partial-last-thousand.tar --warning=no-timestamp ) partial reference: same
(cd repos/partial-references/; tar xf "$TESTTMP/references"/smoke-test-B-4324509a-partial-same.tar --warning=no-timestamp ) already up to date
+ python create_skip_file.py Setting up reference repository: smoke-test-B-4324509a
main reference
already up to date
partial reference: last-hundred
already up to date
partial reference: last-ten
already up to date
partial reference: last-thousand
already up to date
partial reference: same
already up to date
+ python ./create_skip_file.py
- Fetching recent changes - Fetching recent changes
- Creating environments - Creating environments
- Discovering benchmarks - Discovering benchmarks
......
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