Bug 570739: Another winmo fix - need to scan for wordcode in the filename as we do not run the shell with -Dversion for winmo (r=cpeyer)
authorChris Peyer <cpeyer@adobe.com>
Wed, 30 Jun 2010 17:36:13 -0700
changeset 4901 678fe4255f0fdf4e4ff519ee9085ddb3a028dbc8
parent 4900 b8280ee75e9df2d7e13c37fdacfcbc4eda75c6eb
child 4902 d4ae1396db36cbd31a0dbac05573a1dcfd433e99
push id2602
push usercpeyer@adobe.com
push dateThu, 01 Jul 2010 00:36:22 +0000
reviewerscpeyer
bugs570739
Bug 570739: Another winmo fix - need to scan for wordcode in the filename as we do not run the shell with -Dversion for winmo (r=cpeyer)
test/util/runtestBase.py
--- a/test/util/runtestBase.py
+++ b/test/util/runtestBase.py
@@ -408,18 +408,23 @@ class RuntestBase:
                 # Error getting shell info
                 self.vmtype = 'unknown'
                 self.avmversion = 'unknown'
 
             # determine if api versioning switch is available
             if re.search('AVMFEATURE_API_VERSIONING', self.avm_features):
                 self.apiVersioning = True
 
-        wordcode = '-wordcode' if re.search('AVMFEATURE_WORDCODE_INTERP', self.avm_features) else ''
-
+        # need to also check for wordcode in the avm name for winmo
+        if re.search('AVMFEATURE_WORDCODE_INTERP', self.avm_features) \
+           or re.search('wordcode', self.avm):
+            wordcode = '-wordcode'
+        else:
+            wordcode = ''
+            
         self.config = cputype+'-'+self.osName+'-'+vm+'-'+self.vmtype+wordcode+self.vmargs.replace(" ", "")
 
     def determineOS(self):
         _os = platform.system()
         ostype = ''
         # When running on a windows system we can either be running with cygwin python
         # or with a windows-native python.  Legacy code requires that ostype be kept
         # as win for the osName, but one can check for the python type by querying