Fix java_cpp_enum_tests to run on the bots.

Fix java_cpp_enum_tests to run on the bots.

The bots invoke the tests with a different argv[0] causing the script
name to change.

BUG=None

Committed: https://crrev.com/2d82a68bab29b8ade0ae898f51c7cc7df1a5f85d
Cr-Commit-Position: refs/heads/master@{#303913}

[mkosiba (inactive), 2014-11-12 17:40:08]

mkosiba@chromium.org changed reviewers:
+ jbudorick@chromium.org

[mkosiba (inactive), 2014-11-12 17:40:08]

PTAL

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

https://codereview.chromium.org/720893003/diff/1/build/android/gyp/java_cpp_e...
File build/android/gyp/java_cpp_enum_tests.py (right):

https://codereview.chromium.org/720893003/diff/1/build/android/gyp/java_cpp_e...
build/android/gyp/java_cpp_enum_tests.py:46: self.assertEqual(expected %
GetScriptName(), output)
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//

[mkosiba (inactive), 2014-11-12 21:21:31]

On 2014/11/12 17:50:29, jbudorick wrote:
>
https://codereview.chromium.org/720893003/diff/1/build/android/gyp/java_cpp_e...
> File build/android/gyp/java_cpp_enum_tests.py (right):
> 
>
https://codereview.chromium.org/720893003/diff/1/build/android/gyp/java_cpp_e...
> build/android/gyp/java_cpp_enum_tests.py:46: self.assertEqual(expected %
> GetScriptName(), output)
> 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//

well, other than doing really weird reflection there is no way to find what is
the
'current' file. Note that in when running on the bot the entire path is
different,
it's not just an issue of us grabbing the wrong occurrence of 'build' since
src/build/android/test_runner.py is not the same as
build/android/gyp/java_cpp_enum.py
I could change the method to find the last occurrence of 'build' in the path,
but it wouldn't fix the test anyway.

[jbudorick, 2014-11-12 21:39:33]

On 2014/11/12 21:21:31, mkosiba wrote:
> On 2014/11/12 17:50:29, jbudorick wrote:
> >
>
https://codereview.chromium.org/720893003/diff/1/build/android/gyp/java_cpp_e...
> > File build/android/gyp/java_cpp_enum_tests.py (right):
> > 
> >
>
https://codereview.chromium.org/720893003/diff/1/build/android/gyp/java_cpp_e...
> > build/android/gyp/java_cpp_enum_tests.py:46: self.assertEqual(expected %
> > GetScriptName(), output)
> > 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//
> 
> well, other than doing really weird reflection there is no way to find what is
> the
> 'current' file. Note that in when running on the bot the entire path is
> different,
> it's not just an issue of us grabbing the wrong occurrence of 'build' since
> src/build/android/test_runner.py is not the same as
> build/android/gyp/java_cpp_enum.py
> I could change the method to find the last occurrence of 'build' in the path,
> but it wouldn't fix the test anyway.

Sounds good. I just wanted to make sure that that difference was ok.

lgtm

[mkosiba (inactive), 2014-11-12 21:49:04]

The CQ bit was checked by mkosiba@chromium.org

[commit-bot: I haz the power, 2014-11-12 21:49:44]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/720893003/1

[commit-bot: I haz the power, 2014-11-12 23:12:49]

Committed patchset #1 (id:1)

[commit-bot: I haz the power, 2014-11-12 23:13:33]

Patchset 1 (id:??) landed as
https://crrev.com/2d82a68bab29b8ade0ae898f51c7cc7df1a5f85d
Cr-Commit-Position: refs/heads/master@{#303913}