Fix java_cpp_enum_tests to run on the bots.

build/android/gyp/java_cpp_enum_tests.py

 #!/usr/bin/env python
 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Tests for enum_preprocess.py.
 
 This test suite containss various tests for the C++ -> Java enum generator.
 """
 
 import collections
 import optparse
 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
 
 class TestPreprocess(unittest.TestCase):
   def testOutput(self):
     definition = EnumDefinition(original_enum_name='ClassName',
                                 enum_package='some.package',
                                 entries=[('E1', 1), ('E2', '2 << 2')])
     output = GenerateOutput('path/to/file', definition)
     expected = """
 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // This file is autogenerated by
-//     build/android/gyp/java_cpp_enum_tests.py
+//     %s
 // From
 //     path/to/file
 
 package some.package;
 
 public class ClassName {
   public static final int E1 = 1;
   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 = """
       // GENERATED_JAVA_ENUM_PACKAGE: test.namespace
       enum EnumName {
         VALUE_ZERO,
         VALUE_ONE,
       };
     """.split('\n')
     definitions = HeaderParser(test_data).ParseDefinitions()
@@ skipping 276 matching lines @@
   options, _ = parser.parse_args(argv)
 
   suite = unittest.TestLoader().loadTestsFromTestCase(TestPreprocess)
   unittest.TextTestRunner(verbosity=0).run(suite)
 
   if options.stamp:
     build_utils.Touch(options.stamp)
 
 if __name__ == '__main__':
   main(sys.argv[1:])