run-tests: use $HGTEST_RUN_TESTS_PURE
authortimeless@mozdev.org
Wed, 02 Sep 2015 15:19:05 -0400
changeset 26158 342ab95a1f4b
parent 26157 65e41f388970
child 26159 f3b467aca485
run-tests: use $HGTEST_RUN_TESTS_PURE test-run-tests and test-hghave call run-tests; if you don't have a working build environment, and you are trying to use --pure, then if they don't use --pure or --with-hg, they'll break.
tests/run-tests.py
tests/test-hghave.t
tests/test-run-tests.t
--- a/tests/run-tests.py	Wed Sep 02 15:12:08 2015 -0400
+++ b/tests/run-tests.py	Wed Sep 02 15:19:05 2015 -0400
@@ -35,6 +35,8 @@
 #      ./run-tests.py -j2 -c --local test-s*  # unsupported (and broken)
 #  9) parallel, custom tmp dir:
 #      ./run-tests.py -j2 --tmpdir /tmp/myhgtests
+#  10) parallel, pure, tests that call run-tests:
+#      ./run-tests.py --pure `grep -l run-tests.py *.t`
 #
 # (You could use any subset of the tests: test-s* happens to match
 # enough that it's worth doing parallel runs, few enough that it
--- a/tests/test-hghave.t	Wed Sep 02 15:12:08 2015 -0400
+++ b/tests/test-hghave.t	Wed Sep 02 15:19:05 2015 -0400
@@ -18,7 +18,7 @@
   >   $ echo foo
   >   foo
   > EOF
-  $ run-tests.py test-hghaveaddon.t
+  $ run-tests.py $HGTEST_RUN_TESTS_PURE test-hghaveaddon.t
   .
   # Ran 1 tests, 0 skipped, 0 warned, 0 failed.
 
--- a/tests/test-run-tests.t	Wed Sep 02 15:12:08 2015 -0400
+++ b/tests/test-run-tests.t	Wed Sep 02 15:19:05 2015 -0400
@@ -580,7 +580,7 @@
   >   $ echo foo
   >   foo
   > EOF
-  $ run-tests.py test-hghave.t
+  $ run-tests.py $HGTEST_RUN_TESTS_PURE test-hghave.t
   .
   # Ran 1 tests, 0 skipped, 0 warned, 0 failed.
 
@@ -599,7 +599,7 @@
   >   #
   >   # check-code - a style and portability checker for Mercurial
   > EOF
-  $ run-tests.py test-runtestdir.t
+  $ run-tests.py $HGTEST_RUN_TESTS_PURE test-runtestdir.t
   .
   # Ran 1 tests, 0 skipped, 0 warned, 0 failed.
 
@@ -616,7 +616,7 @@
   >   $ custom-command.sh
   >   hello world
   > EOF
-  $ run-tests.py test-testdir-path.t
+  $ run-tests.py $HGTEST_RUN_TESTS_PURE test-testdir-path.t
   .
   # Ran 1 tests, 0 skipped, 0 warned, 0 failed.
 
@@ -628,10 +628,10 @@
   >   $ echo pass
   >   pass
   > EOF
-  $ run-tests.py test-very-slow-test.t
+  $ run-tests.py $HGTEST_RUN_TESTS_PURE test-very-slow-test.t
   s
   Skipped test-very-slow-test.t: skipped
   # Ran 0 tests, 1 skipped, 0 warned, 0 failed.
-  $ run-tests.py --allow-slow-tests test-very-slow-test.t
+  $ run-tests.py $HGTEST_RUN_TESTS_PURE --allow-slow-tests test-very-slow-test.t
   .
   # Ran 1 tests, 0 skipped, 0 warned, 0 failed.