[ffigen] Fix coverage configuration (#337)
* Fix coverage configuration
* Remove test_coverage.dart and only run coverage on mac
diff --git a/pkgs/ffigen/.github/workflows/test-package.yml b/pkgs/ffigen/.github/workflows/test-package.yml
index 90e290e..8d404a8 100644
--- a/pkgs/ffigen/.github/workflows/test-package.yml
+++ b/pkgs/ffigen/.github/workflows/test-package.yml
@@ -52,13 +52,6 @@
run: dart test/setup.dart
- name: Run VM tests
run: dart test --platform vm
- - name: Collect coverage
- run: ./tool/coverage.sh
- - name: Upload coverage
- uses: coverallsapp/github-action@v1.1.2
- with:
- github-token: ${{ secrets.GITHUB_TOKEN }}
- path-to-lcov: lcov.info
mac-test:
needs: analyze
diff --git a/pkgs/ffigen/.gitignore b/pkgs/ffigen/.gitignore
index 96f7b01..71c0ba1 100644
--- a/pkgs/ffigen/.gitignore
+++ b/pkgs/ffigen/.gitignore
@@ -37,3 +37,5 @@
# Files generated by tests for debugging purposes.
test/debug_generated/*
!test/debug_generated/readme.md
+lcov.info
+coverage.json
diff --git a/pkgs/ffigen/test/test_coverage.dart b/pkgs/ffigen/test/test_coverage.dart
deleted file mode 100644
index 88623ba..0000000
--- a/pkgs/ffigen/test/test_coverage.dart
+++ /dev/null
@@ -1,70 +0,0 @@
-// Copyright (c) 2020, the Dart project authors. Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-import 'code_generator_tests/code_generator_test.dart' as code_generator_test;
-import 'collision_tests/decl_decl_collision_test.dart'
- as collision_tests_decl_decl_collision_test;
-import 'collision_tests/reserved_keyword_collision_test.dart'
- as collision_tests_reserved_keyword_collision_test;
-import 'config_tests/compiler_opts_test.dart'
- as config_tests_compiler_opts_test;
-import 'example_tests/cjson_example_test.dart'
- as example_tests_cjson_example_test;
-import 'example_tests/libclang_example_test.dart'
- as example_tests_libclang_example_test;
-import 'example_tests/simple_example_test.dart'
- as example_tests_simple_example_test;
-import 'header_parser_tests/comment_markup_test.dart'
- as header_parser_tests_comment_markup_test;
-import 'header_parser_tests/dart_handle_test.dart'
- as header_parser_tests_dart_handle_test;
-import 'header_parser_tests/forward_decl_test.dart'
- as header_parser_tests_forward_decl_test;
-import 'header_parser_tests/function_n_struct_test.dart'
- as header_parser_tests_function_n_struct_test;
-import 'header_parser_tests/functions_test.dart'
- as header_parser_tests_functions_test;
-import 'header_parser_tests/globals_test.dart'
- as header_parser_tests_globals_test;
-import 'header_parser_tests/macros_test.dart'
- as header_parser_tests_macros_test;
-import 'header_parser_tests/native_func_typedef_test.dart'
- as header_parser_tests_native_func_typedef_test;
-import 'header_parser_tests/nested_parsing_test.dart'
- as header_parser_tests_nested_parsing_test;
-import 'header_parser_tests/opaque_dependencies_test.dart'
- as header_parser_tests_opaque_dependencies_test;
-import 'header_parser_tests/typedef_test.dart'
- as header_parser_tests_typedef_test;
-import 'header_parser_tests/unnamed_enums_test.dart'
- as header_parser_tests_unnamed_enums_test;
-import 'large_integration_tests/large_test.dart'
- as large_integration_tests_large_test;
-import 'native_test/native_test.dart' as native_test_native_test;
-import 'rename_tests/rename_test.dart' as rename_tests_rename_test;
-
-void main() {
- large_integration_tests_large_test.main();
- example_tests_cjson_example_test.main();
- example_tests_simple_example_test.main();
- example_tests_libclang_example_test.main();
- collision_tests_decl_decl_collision_test.main();
- collision_tests_reserved_keyword_collision_test.main();
- config_tests_compiler_opts_test.main();
- header_parser_tests_comment_markup_test.main();
- header_parser_tests_dart_handle_test.main();
- header_parser_tests_forward_decl_test.main();
- header_parser_tests_functions_test.main();
- header_parser_tests_globals_test.main();
- header_parser_tests_macros_test.main();
- header_parser_tests_function_n_struct_test.main();
- header_parser_tests_native_func_typedef_test.main();
- header_parser_tests_nested_parsing_test.main();
- header_parser_tests_opaque_dependencies_test.main();
- header_parser_tests_typedef_test.main();
- header_parser_tests_unnamed_enums_test.main();
- native_test_native_test.main();
- rename_tests_rename_test.main();
- code_generator_test.main();
-}
diff --git a/pkgs/ffigen/tool/coverage.sh b/pkgs/ffigen/tool/coverage.sh
index 7cecbfe..02c8e2f 100755
--- a/pkgs/ffigen/tool/coverage.sh
+++ b/pkgs/ffigen/tool/coverage.sh
@@ -8,12 +8,8 @@
set -e
# Gather coverage.
-dart pub global activate remove_from_coverage
dart pub global activate coverage
# Generate coverage report.
-dart --pause-isolates-on-exit --disable-service-auth-codes --enable-vm-service=3000 test/test_coverage.dart &
-dart pub global run coverage:collect_coverage --wait-paused --uri=http://127.0.0.1:3000/ -o coverage.json --resume-isolates
-dart pub global run coverage:format_coverage --lcov -i coverage.json -o lcov.info
-
-# Remove extra files from coverage report.
-dart pub global run remove_from_coverage -f lcov.info -r ".pub-cache"
+dart run --pause-isolates-on-exit --disable-service-auth-codes --enable-vm-service=3000 test &
+dart pub global run coverage:collect_coverage --wait-paused --uri=http://127.0.0.1:3000/ -o coverage.json --resume-isolates --scope-output=ffigen
+dart pub global run coverage:format_coverage --packages=.dart_tool/package_config.json --lcov -i coverage.json -o lcov.info
