Permalink
Browse files

Fixes QA tests so they can we run without a PHP interpreter.

git-svn-id: svn://cherokee-project.com/cherokee/trunk@3526 5dc97367-97f1-0310-9951-d761b3857238
  • Loading branch information...
1 parent 5ed78b9 commit 0b78500a772ded69606c4ef5dd61042910e9a146 @alobbs alobbs committed Aug 9, 2009
Showing with 15 additions and 5 deletions.
  1. +14 −2 qa/run-tests.py
  2. +1 −3 qa/util.py
View
@@ -128,10 +128,22 @@
python_interpreter = look_for_python()
print "Interpreters"
-print_key('PHP', php_interpreter)
-print_key('Python', python_interpreter)
+if php_interpreter:
+ print_key('PHP', php_interpreter)
+else:
+ print_key('PHP', "Couldn't find a suitable PHP interpreter (with fastcgi support)")
+
+if python_interpreter:
+ print_key('Python', python_interpreter)
+else:
+ print_key('Python', "ERROR: Python interpreter not found")
print
+# Might need to fake PHP
+fake_php = len(php_interpreter) == 0
+if fake_php > 0:
+ php_interpreter = "false"
+
# Set the panic script
panic = CHEROKEE_PANIC
View
@@ -119,8 +119,7 @@ def look_for_php():
__php_ref = php
return php
- error = "Couldn't find a suitable PHP interpreter (with fastcgi support)"
- __php_ref = error
+ __php_ref = ''
return __php_ref
@@ -142,7 +141,6 @@ def look_for_python():
__python_ref = py
return py
- print "ERROR: Python interpreter not found"
__python_ref = ''
return __python_ref

0 comments on commit 0b78500

Please sign in to comment.