Merge branch 'master' into skip_ffi

.travis.yml

diff --git a/.travis.yml b/.travis.yml
index 48fc099..d9a41a5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,7 @@
   - dev
 
 dart_task:
-  - test: -p vm
+  - test: -p vm -x ffi
   - test: -p firefox
   - dartanalyzer
 

analysis_options.yaml

diff --git a/analysis_options.yaml b/analysis_options.yaml
index 2299a33..76203fd 100644
--- a/analysis_options.yaml
+++ b/analysis_options.yaml
@@ -1,5 +1,8 @@
 analyzer:
-  errors:
+  exclude:
+     - test/number_format_compact_icu_test.dart # TODO(240): Update for FFI changes
+
+errors:
     dead_code: error
     override_on_non_overriding_method: error
     unused_element: error

test/number_format_compact_icu_test.dart

diff --git a/test/number_format_compact_icu_test.dart b/test/number_format_compact_icu_test.dart
index db6eacd..27cbd8e 100644
--- a/test/number_format_compact_icu_test.dart
+++ b/test/number_format_compact_icu_test.dart
@@ -4,6 +4,7 @@
 /// testing the package:intl implementation, they only help verify consistent
 /// behaviour across platforms.
 @TestOn("!browser")
+@Tags(['ffi'])
 import 'dart:ffi';
 import 'package:ffi/ffi.dart';
 import 'package:test/test.dart';