[Erp5-report] r42882 jm - /erp5/trunk/products/ERP5/tests/testXHTML.py

[nobody at svn.erp5.org]

Author: jm
Date: Tue Feb  1 10:54:09 2011
New Revision: 42882

URL: http://svn.erp5.org?rev=42882&view=rev
Log:
Allow to specify where testXHTML should find the w3c markup validator

Modified:
    erp5/trunk/products/ERP5/tests/testXHTML.py

Modified: erp5/trunk/products/ERP5/tests/testXHTML.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/tests/testXHTML.py?rev=42882&r1=42881&r2=42882&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/tests/testXHTML.py [utf8] (original)
+++ erp5/trunk/products/ERP5/tests/testXHTML.py [utf8] Tue Feb  1 10:54:09 2011
@@ -629,9 +629,9 @@ validator = None
 # tidy or w3c may not be installed in livecd. Then we will skip xhtml validation tests.
 # create the validator object
 if validator_to_use == 'w3c':
-  validator_paths = ['/usr/share/w3c-markup-validator/cgi-bin/check',
-                     '/usr/lib/cgi-bin/check']
-  for validator_path in validator_paths:
+  default = '/usr/share/w3c-markup-validator/cgi-bin:/usr/lib/cgi-bin'
+  for path in os.environ.get('CGI_PATH', default).split(os.pathsep):
+    validator_path = os.path.join(path, 'check')
     if os.path.exists(validator_path):
       validator = W3Validator(validator_path, show_warnings)
       break