Bug 1780222 - annotation report should show multi line conditions pro…

…perly. r=gbrown,webdriver-reviewers,whimboo

Differential Revision: https://phabricator.services.mozilla.com/D155761

testing/firefox-ui/tests/functional/safebrowsing/manifest.ini

@@ -1,4 +1,8 @@
 [test_initial_download.py]
-skip-if = debug || asan || (cc_type == "clang" && os == 'win') || (os == 'win' && bits == 64 && !debug && processor == "x86_64") # the GAPI key isn't available in debug or asan builds, bug 1526450
+skip-if =
+  debug
+  asan
+  (cc_type == 'clang' && os == 'win')
+  (os == 'win' && bits == 64 && !debug && processor == 'x86_64') # the GAPI key isn't available in debug or asan builds, bug 1526450
 [test_notification.py]
 [test_warning_pages.py]

testing/marionette/harness/marionette_harness/tests/unit/unit-tests.ini

@@ -72,7 +72,8 @@ expected = fail
 [test_click_scrolling.py]
 [test_profile_management.py]
 skip-if =
-  manage_instance == false || (debug && ((os == 'mac') || (os == 'linux'))) # Bug 1450355
+  manage_instance == false
+  (debug && ((os == 'mac') || (os == 'linux'))) # Bug 1450355
 [test_quit_restart.py]
 skip-if = manage_instance == false
 [test_context.py]
@@ -86,7 +87,7 @@ skip-if = manage_instance == false
 
 [test_teardown_context_preserved.py]
 [test_file_upload.py]
-skip-if = os == "win" # http://bugs.python.org/issue14574
+skip-if = os == 'win' # http://bugs.python.org/issue14574
 
 [test_execute_sandboxes.py]
 [test_prefs.py]
@@ -100,7 +101,8 @@ skip-if = manage_instance == false
 [test_select.py]
 [test_crash.py]
 skip-if =
-  asan || manage_instance == false
+  asan
+  manage_instance == false
 [test_localization.py]
 
 [test_reftest.py]

testing/mozbase/mozinstall/tests/manifest.ini

@@ -1,8 +1,8 @@
 [DEFAULT]
 subsuite = mozbase
 [test_binary.py]
-skip-if = os == "mac"
+skip-if = os == 'mac'
 [test_install.py]
-skip-if = os == "mac"  # intermittent
+skip-if = os == 'mac'  # intermittent
 [test_is_installer.py]
 [test_uninstall.py]

testing/mozbase/mozprocess/tests/manifest.ini

@@ -1,7 +1,7 @@
 [DEFAULT]
 subsuite = mozbase
 [test_detached.py]
-skip-if = os == "win"  # Bug 1493796
+skip-if = os == 'win'  # Bug 1493796
 [test_kill.py]
 [test_misc.py]
 [test_pid.py]

testing/mozbase/mozrunner/tests/manifest.ini

@@ -2,7 +2,7 @@
 subsuite = mozbase
 # We skip these tests in automated Windows builds because they trigger crashes
 # in sh.exe; see bug 1489277.
-skip-if = automation && os == "win"
+skip-if = automation && os == 'win'
 [test_crash.py]
 [test_interactive.py]
 [test_start.py]

testing/testinfo.py

@@ -582,6 +582,18 @@ def matches_filters(test):
                             # "skip-if(Android&&webrender) skip-if(OSX)", would be
                             # encoded as t['skip-if'] = "Android&&webrender;OSX".
                             annotation_conditions = t[key].split(";")
+
+                            # if key has \n in it, we need to strip it. for manifestparser format
+                            #  1) from the beginning of the line
+                            #  2) different conditions if in the middle of the line
+                            annotation_conditions = [
+                                x.strip("\n") for x in annotation_conditions
+                            ]
+                            temp = []
+                            for condition in annotation_conditions:
+                                temp.extend(condition.split("\n"))
+                            annotation_conditions = temp
+
                             for condition in annotation_conditions:
                                 condition_count += 1
                                 # Trim reftest fuzzy-if ranges: everything after the first comma

testing/xpcshell/example/unit/xpcshell.ini

@@ -17,10 +17,10 @@ support-files =
 
 [test_add_setup.js]
 [test_check_nsIException.js]
-skip-if = os == "win" && debug
+skip-if = os == 'win' && debug
 [test_check_nsIException_failing.js]
 fail-if = true
-skip-if = os == "win" && debug
+skip-if = os == 'win' && debug
 
 [test_do_get_tempdir.js]
 [test_execute_soon.js]
@@ -46,11 +46,11 @@ fail-if = true
 skip-if = true
 
 [test_do_check_null.js]
-skip-if = os == "win" && debug
+skip-if = os == 'win' && debug
 
 [test_do_check_null_failing.js]
 fail-if = true
-skip-if = os == "win" && debug
+skip-if = os == 'win' && debug
 
 [test_do_check_matches.js]
 [test_do_check_matches_failing.js]