Mercurial > evolve

changeset 5610:57030b9d71c3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: use appropriate Python (2 or 3) for md5sum.py
author Anton Shestakov <av6@dwimlabs.net>
date Sat, 24 Oct 2020 23:26:41 +0800
parents db1dd9fec06c
children 11b8f7003713
files tests/test-stablesort-branchpoint-criss-cross.t tests/test-stablesort-branchpoint.t tests/test-stablesort-criss-cross.t tests/test-stablesort.t
diffstat 4 files changed, 23 insertions(+), 23 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-stablesort-branchpoint-criss-cross.t	Wed Oct 14 12:10:05 2020 +0200
+++ b/tests/test-stablesort-branchpoint-criss-cross.t	Sat Oct 24 23:26:41 2020 +0800
@@ -715,7 +715,7 @@
   $ hg pull --quiet
 
   $ hg showsort --rev 'all()' > ../crisscross.random.order
-  $ python "$RUNTESTDIR/md5sum.py" ../crisscross.*.order
+  $ "$PYTHON" "$RUNTESTDIR/md5sum.py" ../crisscross.*.order
   d9aab0d1907d5cf64d205a8b9036e959  ../crisscross.random.order
   d9aab0d1907d5cf64d205a8b9036e959  ../crisscross.source.order
   $ diff -u ../crisscross.*.order
--- a/tests/test-stablesort-branchpoint.t	Wed Oct 14 12:10:05 2020 +0200
+++ b/tests/test-stablesort-branchpoint.t	Sat Oct 24 23:26:41 2020 +0800
@@ -386,7 +386,7 @@
 
 check the log output are different
 
-  $ python "$RUNTESTDIR/md5sum.py" *.log
+  $ "$PYTHON" "$RUNTESTDIR/md5sum.py" *.log
   55919ebc9c02f28070cf3255b1690f8c  A.log
   c6244b76a60d0707767dc71780e544f3  B.log
   4d8b08b8c50ecbdd2460a62e5852d84d  C.log
@@ -408,7 +408,7 @@
   C
   D
 
-  $ python "$RUNTESTDIR/md5sum.py" *.all.order
+  $ "$PYTHON" "$RUNTESTDIR/md5sum.py" *.all.order
   0c6b2e6f15249c0359b0f93e28c5bd1c  A.all.order
   0c6b2e6f15249c0359b0f93e28c5bd1c  B.all.order
   0c6b2e6f15249c0359b0f93e28c5bd1c  C.all.order
@@ -420,7 +420,7 @@
   >     hg -R repo_$x showsort --rev 'b4594d867745' > ${x}.b4594d867745.order;
   > done
 
-  $ python "$RUNTESTDIR/md5sum.py" *.b4594d867745.order
+  $ "$PYTHON" "$RUNTESTDIR/md5sum.py" *.b4594d867745.order
   5c40900a22008f24eab8dfe2f30ad79f  A.b4594d867745.order
   5c40900a22008f24eab8dfe2f30ad79f  B.b4594d867745.order
   5c40900a22008f24eab8dfe2f30ad79f  C.b4594d867745.order
@@ -432,7 +432,7 @@
   >     hg -R repo_$x showsort --rev '1d8d22637c2d' > ${x}.1d8d22637c2d.order;
   > done
 
-  $ python "$RUNTESTDIR/md5sum.py" *.1d8d22637c2d.order
+  $ "$PYTHON" "$RUNTESTDIR/md5sum.py" *.1d8d22637c2d.order
   77dc20a6f86db9103df8edaae9ad2754  A.1d8d22637c2d.order
   77dc20a6f86db9103df8edaae9ad2754  B.1d8d22637c2d.order
   77dc20a6f86db9103df8edaae9ad2754  C.1d8d22637c2d.order
@@ -444,7 +444,7 @@
   >     hg -R repo_$x showsort --rev 'e7d9710d9fc6+43227190fef8' > ${x}.non-heads.order;
   > done
 
-  $ python "$RUNTESTDIR/md5sum.py" *.non-heads.order
+  $ "$PYTHON" "$RUNTESTDIR/md5sum.py" *.non-heads.order
   94e0ea8cdade135dabde4ec5e9954329  A.non-heads.order
   94e0ea8cdade135dabde4ec5e9954329  B.non-heads.order
   94e0ea8cdade135dabde4ec5e9954329  C.non-heads.order
@@ -519,7 +519,7 @@
   >     hg -R repo_$x showsort --rev 'e7d9710d9fc6+43227190fef8' > ${x}.non-heads.order;
   > done
 
-  $ python "$RUNTESTDIR/md5sum.py" *.non-heads.order
+  $ "$PYTHON" "$RUNTESTDIR/md5sum.py" *.non-heads.order
   94e0ea8cdade135dabde4ec5e9954329  A.non-heads.order
   94e0ea8cdade135dabde4ec5e9954329  B.non-heads.order
   94e0ea8cdade135dabde4ec5e9954329  C.non-heads.order
@@ -673,7 +673,7 @@
   > done;
   $ hg pull --quiet
   $ hg showsort --rev 'all()' > ../multiple.random.order
-  $ python "$RUNTESTDIR/md5sum.py" ../multiple.*.order
+  $ "$PYTHON" "$RUNTESTDIR/md5sum.py" ../multiple.*.order
   6ff802a0a5f0a3ddd82b25f860238fbd  ../multiple.random.order
   6ff802a0a5f0a3ddd82b25f860238fbd  ../multiple.source.order
   $ hg showsort --rev 'all()'
--- a/tests/test-stablesort-criss-cross.t	Wed Oct 14 12:10:05 2020 +0200
+++ b/tests/test-stablesort-criss-cross.t	Sat Oct 24 23:26:41 2020 +0800
@@ -827,7 +827,7 @@
   $ hg pull --quiet
 
   $ hg showsort --rev 'all()' > ../crisscross.random.order
-  $ python "$RUNTESTDIR/md5sum.py" ../crisscross.*.order
+  $ "$PYTHON" "$RUNTESTDIR/md5sum.py" ../crisscross.*.order
   0ace2b2a63ec70b3b63b661aaee69878  ../crisscross.random.order
   0ace2b2a63ec70b3b63b661aaee69878  ../crisscross.source.order
   $ diff -u ../crisscross.*.order
--- a/tests/test-stablesort.t	Wed Oct 14 12:10:05 2020 +0200
+++ b/tests/test-stablesort.t	Sat Oct 24 23:26:41 2020 +0800
@@ -459,7 +459,7 @@
 
 check the log output are different
 
-  $ python "$RUNTESTDIR/md5sum.py" *.log
+  $ "$PYTHON" "$RUNTESTDIR/md5sum.py" *.log
   55919ebc9c02f28070cf3255b1690f8c  A.log
   c6244b76a60d0707767dc71780e544f3  B.log
   4d8b08b8c50ecbdd2460a62e5852d84d  C.log
@@ -481,7 +481,7 @@
   C
   D
 
-  $ python "$RUNTESTDIR/md5sum.py" *.all.order
+  $ "$PYTHON" "$RUNTESTDIR/md5sum.py" *.all.order
   25e89e555b56ed9e7b51827d58073b77  A.all.order
   25e89e555b56ed9e7b51827d58073b77  B.all.order
   25e89e555b56ed9e7b51827d58073b77  C.all.order
@@ -493,7 +493,7 @@
   >     hg -R repo_$x showsort --rev 'b4594d867745' > ${x}.b4594d867745.order;
   > done
 
-  $ python "$RUNTESTDIR/md5sum.py" *.b4594d867745.order
+  $ "$PYTHON" "$RUNTESTDIR/md5sum.py" *.b4594d867745.order
   5c40900a22008f24eab8dfe2f30ad79f  A.b4594d867745.order
   5c40900a22008f24eab8dfe2f30ad79f  B.b4594d867745.order
   5c40900a22008f24eab8dfe2f30ad79f  C.b4594d867745.order
@@ -507,17 +507,17 @@
   >     hg -R repo_$x showsorthead --rev '1d8d22637c2d' --limit 4 > ${x}.1d8d22637c2d.orderhead-4;
   > done
 
-  $ python "$RUNTESTDIR/md5sum.py" *.1d8d22637c2d.order
+  $ "$PYTHON" "$RUNTESTDIR/md5sum.py" *.1d8d22637c2d.order
   77dc20a6f86db9103df8edaae9ad2754  A.1d8d22637c2d.order
   77dc20a6f86db9103df8edaae9ad2754  B.1d8d22637c2d.order
   77dc20a6f86db9103df8edaae9ad2754  C.1d8d22637c2d.order
   77dc20a6f86db9103df8edaae9ad2754  D.1d8d22637c2d.order
-  $ python "$RUNTESTDIR/md5sum.py" *.1d8d22637c2d.orderhead
+  $ "$PYTHON" "$RUNTESTDIR/md5sum.py" *.1d8d22637c2d.orderhead
   77dc20a6f86db9103df8edaae9ad2754  A.1d8d22637c2d.orderhead
   77dc20a6f86db9103df8edaae9ad2754  B.1d8d22637c2d.orderhead
   77dc20a6f86db9103df8edaae9ad2754  C.1d8d22637c2d.orderhead
   77dc20a6f86db9103df8edaae9ad2754  D.1d8d22637c2d.orderhead
-  $ python "$RUNTESTDIR/md5sum.py" *.1d8d22637c2d.orderhead-4
+  $ "$PYTHON" "$RUNTESTDIR/md5sum.py" *.1d8d22637c2d.orderhead-4
   ea12ffc0007e1b4b911d09dd478881f3  A.1d8d22637c2d.orderhead-4
   ea12ffc0007e1b4b911d09dd478881f3  B.1d8d22637c2d.orderhead-4
   ea12ffc0007e1b4b911d09dd478881f3  C.1d8d22637c2d.orderhead-4
@@ -531,12 +531,12 @@
   >     hg -R repo_$x showsorthead --rev 'e7d9710d9fc6+43227190fef8' --limit 6 > ${x}.non-heads.orderhead-6;
   > done
 
-  $ python "$RUNTESTDIR/md5sum.py" *.non-heads.order
+  $ "$PYTHON" "$RUNTESTDIR/md5sum.py" *.non-heads.order
   94e0ea8cdade135dabde4ec5e9954329  A.non-heads.order
   94e0ea8cdade135dabde4ec5e9954329  B.non-heads.order
   94e0ea8cdade135dabde4ec5e9954329  C.non-heads.order
   94e0ea8cdade135dabde4ec5e9954329  D.non-heads.order
-  $ python "$RUNTESTDIR/md5sum.py" *.non-heads.orderhead
+  $ "$PYTHON" "$RUNTESTDIR/md5sum.py" *.non-heads.orderhead
   1e5ce05b507a058c5dac3d7de9ae8feb  A.non-heads.orderhead
   4b07febabfee9528aedcea156a7d7071  B.non-heads.orderhead
   1e5ce05b507a058c5dac3d7de9ae8feb  C.non-heads.orderhead
@@ -613,7 +613,7 @@
   >     hg -R repo_$x showsort --rev '43227190fef8' > ${x}.non-head-B.orderhead;
   > done
 
-  $ python "$RUNTESTDIR/md5sum.py" *.non-heads.order
+  $ "$PYTHON" "$RUNTESTDIR/md5sum.py" *.non-heads.order
   94e0ea8cdade135dabde4ec5e9954329  A.non-heads.order
   94e0ea8cdade135dabde4ec5e9954329  B.non-heads.order
   94e0ea8cdade135dabde4ec5e9954329  C.non-heads.order
@@ -621,11 +621,11 @@
   94e0ea8cdade135dabde4ec5e9954329  E.non-heads.order
   94e0ea8cdade135dabde4ec5e9954329  F.non-heads.order
   94e0ea8cdade135dabde4ec5e9954329  G.non-heads.order
-  $ python "$RUNTESTDIR/md5sum.py" *.non-head-A.orderhead
+  $ "$PYTHON" "$RUNTESTDIR/md5sum.py" *.non-head-A.orderhead
   1e5ce05b507a058c5dac3d7de9ae8feb  E.non-head-A.orderhead
   1e5ce05b507a058c5dac3d7de9ae8feb  F.non-head-A.orderhead
   1e5ce05b507a058c5dac3d7de9ae8feb  G.non-head-A.orderhead
-  $ python "$RUNTESTDIR/md5sum.py" *.non-head-B.orderhead
+  $ "$PYTHON" "$RUNTESTDIR/md5sum.py" *.non-head-B.orderhead
   4b07febabfee9528aedcea156a7d7071  E.non-head-B.orderhead
   4b07febabfee9528aedcea156a7d7071  F.non-head-B.orderhead
   4b07febabfee9528aedcea156a7d7071  G.non-head-B.orderhead
@@ -830,13 +830,13 @@
   $ hg showsort --rev 'all()' > ../multiple.random.order
   $ hg showsorthead --rev '160a7a0adbf4' > ../160a7a0adbf4.random.orderhead
   $ hg showsorthead --rev '4bbfc6078919' > ../4bbfc6078919.random.orderhead
-  $ python "$RUNTESTDIR/md5sum.py" ../multiple.*.order
+  $ "$PYTHON" "$RUNTESTDIR/md5sum.py" ../multiple.*.order
   19b28a58af0311b99159f60944a57213  ../multiple.random.order
   19b28a58af0311b99159f60944a57213  ../multiple.source.order
-  $ python "$RUNTESTDIR/md5sum.py" ../160a7a0adbf4.*.orderhead
+  $ "$PYTHON" "$RUNTESTDIR/md5sum.py" ../160a7a0adbf4.*.orderhead
   905b0bab9155f65ed2e220382b94e9b9  ../160a7a0adbf4.random.orderhead
   905b0bab9155f65ed2e220382b94e9b9  ../160a7a0adbf4.source.orderhead
-  $ python "$RUNTESTDIR/md5sum.py" ../4bbfc6078919.*.orderhead
+  $ "$PYTHON" "$RUNTESTDIR/md5sum.py" ../4bbfc6078919.*.orderhead
   3732305a333d59ec50b91db0f5ab696e  ../4bbfc6078919.random.orderhead
   3732305a333d59ec50b91db0f5ab696e  ../4bbfc6078919.source.orderhead
   $ hg showsort --rev 'all()'