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 16, 2018, 11:21 p.m.
Message ID <355e1b35b7f4dbcf90f7c137f418278d@localhost.localdomain>
Download mbox | patch
Permalink /patch/31133/
State Not Applicable
Headers show

Comments

phabricator - April 16, 2018, 11:21 p.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG1b71a397d6b2: tests: make sure test-run-tests.t actually runs run-tests.py under Python 3 (authored by durin42, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D3349?vs=8226&id=8343

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

AFFECTED FILES
  tests/test-run-tests.t

CHANGE DETAILS




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]