Provide defines as local variables in if-expressions.

grit/grd_reader_unittest.py

Index: grit/grd_reader_unittest.py
diff --git a/grit/grd_reader_unittest.py b/grit/grd_reader_unittest.py
index 065d280740983e5e1adc9fa0b349f2ba3f705382..fd4d08bfbdc803820b8e0b291039f46c39d08dd1 100644
--- a/grit/grd_reader_unittest.py
+++ b/grit/grd_reader_unittest.py
@@ -289,14 +289,6 @@ class GrdReaderUnittest(unittest.TestCase):
   def testEarlyEnoughPlatformSpecification(self):
     # This is a regression test for issue
     # https://code.google.com/p/grit-i18n/issues/detail?id=23
-    #
-    # This test only works on platforms for which one of the is_xyz
-    # shortcuts in .grd expressions is true. If this string remains
-    # empty, abort the test.
-    platform = base.Node.GetPlatformAssertion(sys.platform)
-    if not platform:
-      return
-
     grd_text = u'''<?xml version="1.0" encoding="UTF-8"?>
       <grit latest_public_release="1" current_release="1">
         <release seq="1">
@@ -307,12 +299,12 @@ class GrdReaderUnittest(unittest.TestCase):
             <!-- The assumption is that use_titlecase is never true for
                  this platform. When the platform isn't set to 'android'
                  early enough, we get a duplicate message name. -->
-            <if expr="%s">
+            <if expr="os == '%s'">
               <message name="IDS_XYZ">boo</message>
             </if>
           </messages>
         </release>
-      </grit>''' % platform
+      </grit>''' % sys.platform

[Jói, 2014/02/07 10:53:12]

This test is intended to be a regression test for bug 23, which occurred when
the target platform wasn't set early enough. Are you sure this still tests that?

[newt (away), 2014/02/07 17:24:45]

Yes, the test currently passes, but if I revert the change to grit/grd_reader.py
from https://codereview.chromium.org/118663003, the test fails.

This is because the value of "os" on line 302 is the target platform, so "os" ==
"linux" iff "is_linux" is True, which is what the test previously evaluated.

     with util.TempDir({}) as temp_dir:
       grd_reader.Parse(StringIO.StringIO(grd_text), temp_dir.GetPath(),
                        target_platform='android')