Merge pull request #6137 from brave/android_unittests

Add support for Android unittests
brave · Oct 9, 2019 · 1b87817 · 1b87817
2 parents c4d92ce + 3d83499
commit 1b87817
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/lib/test.js b/lib/test.js
@@ -8,10 +8,14 @@ const test = (suite, buildConfig = config.defaultBuildConfig, options) => {
   config.update(options)
 
   const braveArgs = [
-    '--enable-logging',
-    '--v=' + options.v,
+    '--enable-logging'
   ]
 
+  // Android doesn't support --v
+  if (config.targetOS !== 'android') {
+    braveArgs.push('--v=' + options.v)
+  }
+
   if (options.filter) {
     braveArgs.push('--gtest_filter=' + options.filter)
   }
@@ -35,7 +39,7 @@ const test = (suite, buildConfig = config.defaultBuildConfig, options) => {
   // Build the tests
   util.run('ninja', ['-C', config.outputDir, suite], config.defaultOptions)
 
-  const run_brave_installer_unitests = suite === 'brave_unit_tests'
+  const run_brave_installer_unitests = suite === 'brave_unit_tests' && config.targetOS !== 'android'
   if (run_brave_installer_unitests) {
     util.run('ninja', ['-C', config.outputDir, 'brave_installer_unittests'], config.defaultOptions)
   }