Fix java_cpp_enum_tests to run on the bots.

build/android/gyp/java_cpp_enum_tests.py

Index: build/android/gyp/java_cpp_enum_tests.py
diff --git a/build/android/gyp/java_cpp_enum_tests.py b/build/android/gyp/java_cpp_enum_tests.py
index 0d0049b70255f0b2615e24414dc9bcf396725b31..3aa386e5a87590dc74633e3d95cacadd6f48abb8 100755
--- a/build/android/gyp/java_cpp_enum_tests.py
+++ b/build/android/gyp/java_cpp_enum_tests.py
@@ -14,7 +14,8 @@ import os
 import sys
 import unittest
 
-from java_cpp_enum import EnumDefinition, GenerateOutput, HeaderParser
+from java_cpp_enum import EnumDefinition, GenerateOutput, GetScriptName
+from java_cpp_enum import HeaderParser
 
 sys.path.append(os.path.join(os.path.dirname(__file__), "gyp"))
 from util import build_utils
@@ -31,7 +32,7 @@ class TestPreprocess(unittest.TestCase):
 // found in the LICENSE file.
 
 // This file is autogenerated by
-//     build/android/gyp/java_cpp_enum_tests.py
+//     %s
 // From
 //     path/to/file
 
@@ -42,7 +43,7 @@ public class ClassName {
   public static final int E2 = 2 << 2;
 }
 """
-    self.assertEqual(expected, output)
+    self.assertEqual(expected % GetScriptName(), output)

[jbudorick, 2014/11/12 17:50:29]

Is GetScriptName working as intended? It looks like it's just grabbing the first
instance of 'build' in the path. Normally, that's the 'build' in the checkout,
but if there's a 'build' higher up the directory hierarchy, we start there,
e.g., there are 3 'build' directories in this path:

  This file is autogenerated by\n//    
build/slave/Android_Tests__JB_Nexus7__dbg_/build/src/build/android/test_runner.py\n//

 
   def testParseSimpleEnum(self):
     test_data = """