Index: chrome/test/functional/pyauto_functional.py |
diff --git a/chrome/test/functional/pyauto_functional.py b/chrome/test/functional/pyauto_functional.py |
index 1937a089e9559ab2502ad89271282f2943619d30..0b9b03d7c30c55225138339bd41db84bc455554a 100755 |
--- a/chrome/test/functional/pyauto_functional.py |
+++ b/chrome/test/functional/pyauto_functional.py |
@@ -77,7 +77,14 @@ def RunWithCorrectPythonIfNecessary(): |
RunAgain() |
-RunWithCorrectPythonIfNecessary() |
+# Check the environment variable DO_NOT_RESTART_PYTHON_FOR_PYAUTO. If |
Nirnimesh
2012/07/12 02:36:24
The comment is too long, and is explaining the cod
fdeng1
2012/07/12 03:47:52
Done.
|
+# it is set (to any value), then do not try to run with the correct |
+# python(i.e. 2.6) regardless what the current python version is. |
+if os.getenv('DO_NOT_RESTART_PYTHON_FOR_PYAUTO') is None: |
+ RunWithCorrectPythonIfNecessary() |
+else: |
+ print 'Will not try to restart with the correct version of python '\ |
+ 'as DO_NOT_RESTART_PYTHON_FOR_PYAUTO is set.' |
try: |