Merge "Avoid too large filter list in VTS GTest"
diff --git a/testcases/template/gtest_binary_test/gtest_binary_test.py b/testcases/template/gtest_binary_test/gtest_binary_test.py
index 6bf3130..9765a47 100644
--- a/testcases/template/gtest_binary_test/gtest_binary_test.py
+++ b/testcases/template/gtest_binary_test/gtest_binary_test.py
@@ -127,17 +127,19 @@
if test_suite.endswith('.'):
test_suite = test_suite[:-1]
- if not self.batch_mode:
- return test_cases
+ #if not self.batch_mode:
+ # Avoid batch mode as it creates overly large filters
+ return test_cases
# Gtest batch mode
- test_names = map(lambda test: test.full_name, test_cases)
+ # test_names = map(lambda test: test.full_name, test_cases)
+ #test_names = {}
- gtest_batch = gtest_test_case.GtestTestCase(
- path, '', path, tag, self.PutTag, working_directory,
- ld_library_path, profiling_library_path, envp=envp)
- gtest_batch.full_name = ':'.join(test_names)
- return [gtest_batch]
+ #gtest_batch = gtest_test_case.GtestTestCase(
+ # path, '', path, tag, self.PutTag, working_directory,
+ # ld_library_path, profiling_library_path, envp=envp)
+ #gtest_batch.full_name = ':'.join(test_names)
+ #return [gtest_batch]
# @Override
def VerifyTestResult(self, test_case, command_results):
diff --git a/testcases/template/gtest_binary_test/gtest_test_case.py b/testcases/template/gtest_binary_test/gtest_test_case.py
index c9a2c5c..29d842f 100644
--- a/testcases/template/gtest_binary_test/gtest_test_case.py
+++ b/testcases/template/gtest_binary_test/gtest_test_case.py
@@ -61,7 +61,7 @@
return [('{cmd} --gtest_filter={test} '
'--gtest_output=xml:{output_file_path}').format(
cmd=super(GtestTestCase, self).GetRunCommand(),
- test=test_name,
+ test = test_name,
output_file_path=self.output_file_path),
'cat {output} && rm -rf {output}'.format(
output=self.output_file_path)]
