Patchwork D3349: tests: make sure test-run-tests.t actually runs run-tests.py under Python 3

login
register
mail settings
Submitter phabricator
Date April 14, 2018, 4:32 a.m.
Message ID <differential-rev-PHID-DREV-rzrupkir54nxqg7mhgec-req@phab.mercurial-scm.org>
Download mbox | patch
Permalink /patch/30973/
State Superseded
Headers show

Comments

phabricator - April 14, 2018, 4:32 a.m.
durin42 created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  I'm fairly certain it hasn't been until now. Mercifully, there doesn't
  appear to be any ninja breakage.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D3349

AFFECTED FILES
  tests/test-run-tests.t

CHANGE DETAILS




To: durin42, #hg-reviewers
Cc: mercurial-devel
phabricator - April 16, 2018, 11:12 p.m.
indygreg accepted this revision.
indygreg added a comment.
This revision is now accepted and ready to land.


  *facepalm*

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D3349

To: durin42, #hg-reviewers, indygreg
Cc: indygreg, mercurial-devel

Patch

diff --git a/tests/test-run-tests.t b/tests/test-run-tests.t
--- a/tests/test-run-tests.t
+++ b/tests/test-run-tests.t
@@ -6,32 +6,31 @@ 
 
 Smoke test with install
 ============
-
-  $ run-tests.py $HGTEST_RUN_TESTS_PURE -l
+  $ $PYTHON $TESTDIR/run-tests.py $HGTEST_RUN_TESTS_PURE -l
   
   # Ran 0 tests, 0 skipped, 0 failed.
 
 Define a helper to avoid the install step
 =============
   $ rt()
   > {
-  >     run-tests.py --with-hg=`which hg` "$@"
+  >     $PYTHON $TESTDIR/run-tests.py --with-hg=`which hg` "$@"
   > }
 
 error paths
 
 #if symlink
   $ ln -s `which true` hg
-  $ run-tests.py --with-hg=./hg
+  $ $PYTHON $TESTDIR/run-tests.py --with-hg=./hg
   warning: --with-hg should specify an hg script
   
   # Ran 0 tests, 0 skipped, 0 failed.
   $ rm hg
 #endif
 
 #if execbit
   $ touch hg
-  $ run-tests.py --with-hg=./hg
+  $ $PYTHON $TESTDIR/run-tests.py --with-hg=./hg
   usage: run-tests.py [options] [tests]
   run-tests.py: error: --with-hg must specify an executable hg script
   [2]