Add icudtl.dat to the list of files to copy for WebKitUnitTests

Add icudtl.dat to the list of files to copy for WebKitUnitTests

icudtl.dat is not copied to an Android device for webkit_unit_tests
leading to the failure of tests depending on ICU.

Add icu.isolate explicitly to get icudtl.dat copied.

TBR=jamesr@chromium.org
BUG=72633
TEST=build/android/test_runner.py gtest -s webkit_unit_tests --verbose
--gtest_filter=WebFrameTest.SelectRange*

Committed: https://src.chromium.org/viewvc/blink?view=rev&revision=168506

[jungshik at Google, 2014-03-04 00:07:21]

@maruel, is this the right way? I'm not sure what it means to set
'dependency_tracked' to nil on Android, which seems to nullify what's set in
upstream isolate files (that would copy icudtl.dat otherwise). 
So, I'm adding that back. 

Perhaps, should I put it inside 'OS==android' condtion block?

[M-A Ruel, 2014-03-04 00:51:15]

can't put includes in conditions.

lgtm

Sent by touching glass
Le 2014-03-03 19:07, <jshin@chromium.org> a écrit :

> Reviewers: M-A Ruel, jamesr,
>
> Message:
> @maruel, is this the right way? I'm not sure what it means to set
> 'dependency_tracked' to nil on Android, which seems to nullify what's set
> in
> upstream isolate files (that would copy icudtl.dat otherwise).
> So, I'm adding that back.
>
> Perhaps, should I put it inside 'OS==android' condtion block?
>
> Description:
> Add icudtl.dat to the list of files to copy for WebKitUnitTests
>
> icudtl.dat is not copied to an Android device for webkit_unit_tests
> leading to test failures depending on ICU.
>
> Add icu.isolate explicitly to get icudtl.dat copied.
>
> BUG=72633
> TEST=build/android/test_runner.py gtest -s webkit_unit_tests --verbose
> --gtest_filter=WebFrameTest.SelectRange*
>
> Please review this at https://codereview.chromium.org/183013006/
>
> SVN Base: svn://svn.chromium.org/blink/trunk
>
> Affected files (+3, -0 lines):
>   M Source/web/WebKitUnitTests.isolate
>
>
> Index: Source/web/WebKitUnitTests.isolate
> diff --git a/Source/web/WebKitUnitTests.isolate
> b/Source/web/WebKitUnitTests.isolate
> index 32bd8710c4479cc009fc17de70c3f085c57785e2..
> 029552ff53a8f3a3777c6969f46246cdb7f0cc3f 100644
> --- a/Source/web/WebKitUnitTests.isolate
> +++ b/Source/web/WebKitUnitTests.isolate
> @@ -43,4 +43,7 @@
>        },
>      }],
>    ],
> +  'includes': [
> +    "../../../../third_party/icu/icu.isolate",
> +  ],
>  }
>
>
>

To unsubscribe from this group and stop receiving emails from it, send an email
to blink-reviews+unsubscribe@chromium.org.

[jungshik at Google, 2014-03-04 20:49:56]

On 2014/03/04 00:51:15, M-A Ruel wrote:
> can't put includes in conditions.
> 
> lgtm

Thank you. I was a bit worried about unconditionally including icu.isolate (for
all platforms) and considered something like below:

  'conditions': [
    ['OS=="android"', {
      'variables': {
        'conditions': [
          ['icu_use_data_file_flag==1', {
            'isolate_dependency_tracked': [
              '$(PRODUCT_DIR)/icudtl.dat',
            ],
          } , {
            'isolate_dependency_tracked': [
            ],
          }],
        ],
        'isolate_dependency_untracked': [
          'tests/data/',
          # Required by some image decoder tests.
          '../platform/image-decoders/testing/',
          '../../LayoutTests/fast/images/resources/',
        ],
      },
    }],
  ],


However, it seems ok (both from trybot results and what you told me offline) to
go with the current patch. So, I'll go with it. 


> 
> Sent by touching glass
> Le 2014-03-03 19:07,
<https://mail.google.com/mail/?view=cm&fs=1&tf=1&to=jshin@chromium.org> a écrit
:
> 
> > Reviewers: M-A Ruel, jamesr,
> >
> > Message:
> > @maruel, is this the right way? I'm not sure what it means to set
> > 'dependency_tracked' to nil on Android, which seems to nullify what's set
> > in
> > upstream isolate files (that would copy icudtl.dat otherwise).
> > So, I'm adding that back.
> >
> > Perhaps, should I put it inside 'OS==android' condtion block?
> >
> > Description:
> > Add icudtl.dat to the list of files to copy for WebKitUnitTests
> >
> > icudtl.dat is not copied to an Android device for webkit_unit_tests
> > leading to test failures depending on ICU.
> >
> > Add icu.isolate explicitly to get icudtl.dat copied.
> >
> > BUG=72633
> > TEST=build/android/test_runner.py gtest -s webkit_unit_tests --verbose
> > --gtest_filter=WebFrameTest.SelectRange*
> >
> > Please review this at https://codereview.chromium.org/183013006/
> >
> > SVN Base: svn://svn.chromium.org/blink/trunk
> >
> > Affected files (+3, -0 lines):
> >   M Source/web/WebKitUnitTests.isolate
> >
> >
> > Index: Source/web/WebKitUnitTests.isolate
> > diff --git a/Source/web/WebKitUnitTests.isolate
> > b/Source/web/WebKitUnitTests.isolate
> > index 32bd8710c4479cc009fc17de70c3f085c57785e2..
> > 029552ff53a8f3a3777c6969f46246cdb7f0cc3f 100644
> > --- a/Source/web/WebKitUnitTests.isolate
> > +++ b/Source/web/WebKitUnitTests.isolate
> > @@ -43,4 +43,7 @@
> >        },
> >      }],
> >    ],
> > +  'includes': [
> > +    "../../../../third_party/icu/icu.isolate",
> > +  ],
> >  }
> >
> >
> >
> 
> To unsubscribe from this group and stop receiving emails from it, send an
email
> to
https://mail.google.com/mail/?view=cm&fs=1&tf=1&to=blink-reviews+unsubscribe@....

[jungshik at Google, 2014-03-04 20:50:06]

The CQ bit was checked by jshin@chromium.org

[commit-bot: I haz the power, 2014-03-04 20:50:57]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/jshin@chromium.org/183013006/20001

[commit-bot: I haz the power, 2014-03-05 18:17:40]

Change committed as 168506