ts: 2.4 changes

alalek · alalek · commit 8577f718105c · 2016-10-20T16:26:19.000+03:00
diff --git a/modules/ts/misc/run_suite.py b/modules/ts/misc/run_suite.py
@@ -85,7 +85,7 @@ def getTestList(self, white, black):
         return set(res)
 
     def isTest(self, fullpath):
-        if fullpath in ['java', 'python2', 'python3']:
+        if fullpath in ['java', 'python', 'python2', 'python3']:
             return self.options.mode == 'test'
         if not os.path.isfile(fullpath):
             return False
@@ -117,7 +117,7 @@ def runTest(self, path, logfile, workingDir, args = []):
             cmd = [self.cache.ant_executable, "-Dopencv.build.type=%s" % self.cache.build_type, "buildAndTest"]
             ret = execute(cmd, cwd = self.cache.java_test_binary_dir + "/.build")
             return None, ret
-        elif path in ['python2', 'python3']:
+        elif path in ['python', 'python2', 'python3']:
             executable = os.getenv('OPENCV_PYTHON_BINARY', None)
             if executable is None:
                 executable = path
@@ -164,7 +164,7 @@ def runTests(self, tests, black, workingDir, args = []):
             more_args = []
             exe = self.getTest(test)
 
-            if exe in ["java", "python2", "python3"]:
+            if exe in ["java", "python", "python2", "python3"]:
                 logname = None
             else:
                 userlog = [a for a in args if a.startswith("--gtest_output=")]
diff --git a/modules/ts/misc/run_utils.py b/modules/ts/misc/run_utils.py
@@ -175,6 +175,7 @@ def testSIMD(compiler, cxx_flags, compiler_arg = None):
     {'name': "cuda_library",             'default': None,       'pattern': re.compile(r"^CUDA_CUDA_LIBRARY:FILEPATH=(.+)$")},
     {'name': "cuda_version",             'default': None,       'pattern': re.compile(r"^CUDA_VERSION:STRING=(.+)$")},
     {'name': "core_dependencies",        'default': None,       'pattern': re.compile(r"^opencv_core_LIB_DEPENDS:STATIC=(.+)$")},
+    {'name': "python",                   'default': None,       'pattern': re.compile(r"^BUILD_opencv_python:BOOL=(.*)$")},
     {'name': "python2",                  'default': None,       'pattern': re.compile(r"^BUILD_opencv_python2:BOOL=(.*)$")},
     {'name': "python3",                  'default': None,       'pattern': re.compile(r"^BUILD_opencv_python3:BOOL=(.*)$")},
 )
@@ -253,6 +254,8 @@ def gatherTests(self, mask, isGood = None):
             files = glob.glob(os.path.join(d, mask))
             if not self.getOS() == "android" and self.withJava():
                 files.append("java")
+            if self.withPython():
+                files.append("python")
             if self.withPython2():
                 files.append("python2")
             if self.withPython3():
@@ -261,14 +264,17 @@ def gatherTests(self, mask, isGood = None):
         return []
 
     def isMainModule(self, name):
-        return name in self.main_modules + ['python2', 'python3']
+        return name in self.main_modules + ['python', 'python2', 'python3']
 
     def withCuda(self):
         return self.cuda_version and self.with_cuda == "ON" and self.cuda_library and not self.cuda_library.endswith("-NOTFOUND")
 
     def withJava(self):
         return self.ant_executable and self.java_test_binary_dir
 
+    def withPython(self):
+        return self.python == 'ON'
+
     def withPython2(self):
         return self.python2 == 'ON'
 
