Make -nottags require_icu also turn on -nottags Intl in runtests.py

test/DebuggerCommon/ES6_intl_simple_attach.js

@@ -18,16 +18,16 @@ function Run() {
 
     WScript.Echo('PASSED');/**bp:
     locals(1);
-	evaluate('coll',4);
-	evaluate('numFormat',4);
-	evaluate('dttmFormat',4);
-	evaluate('coll.compare.toString() == \'function() {\\n    [native code]\\n}\'');
+    evaluate('coll',4);
+    evaluate('numFormat',4);
+    evaluate('dttmFormat',4);
+    evaluate('coll.compare.toString() == \'function() {\\n    [native code]\\n}\'');
     evaluate('coll.resolvedOptions.toString() == \'function() {\\n    [native code]\\n}\'');
     evaluate('numFormat.format.toString() == \'function() {\\n    [native code]\\n}\'');
     evaluate('numFormat.resolvedOptions.toString() == \'function() {\\n    [native code]\\n}\'');
     evaluate('dttmFormat.format.toString() == \'function() {\\n    [native code]\\n}\'');
     evaluate('dttmFormat.resolvedOptions.toString() == \'function() {\\n    [native code]\\n}\'');
-	**/
+    **/
 }
 
 var x; /**bp:evaluate('Intl.Collator')**/

test/DebuggerCommon/rlexe.xml

@@ -218,6 +218,7 @@
       <files>ES6_intl_simple_attach.js</files>
       <compile-flags>-dbgbaseline:ES6_intl_simple_attach.js.dbg.baseline -Intl</compile-flags>
       <baseline>ES6_intl_simple_attach.js.baseline</baseline>
+      <!-- This test is still require_winglob because it has winglob-specific output in the .dbg.baseline -->
       <tags>Intl,require_winglob</tags>
     </default>
   </test>

test/runtests.py

@@ -166,6 +166,10 @@ if args.static != None:
 
 if sys.platform == 'darwin':
     not_tags.add('exclude_mac')
+
+if 'require_icu' in not_tags or 'exclude_noicu' in not_tags:
+    not_tags.add('Intl')
+
 not_compile_flags = None
 
 # use -j flag to specify number of parallel processes