From 32271e9f3b11538ef8bf8e8728cf1c5f3a44750f Mon Sep 17 00:00:00 2001 From: Michael Goderbauer Date: Wed, 8 Feb 2017 13:00:44 -0800 Subject: [PATCH] Remove deprecated setup.sh and test.sh (#7976) --- CONTRIBUTING.md | 2 +- dev/automated_tests/test_smoke_test/README.md | 2 +- dev/automated_tests/test_smoke_test/crash1_test.dart | 2 +- dev/automated_tests/test_smoke_test/crash2_test.dart | 2 +- dev/automated_tests/test_smoke_test/fail_test.dart | 2 +- .../test_smoke_test/missing_import_test.broken_dart | 2 +- dev/automated_tests/test_smoke_test/pass_test.dart | 2 +- .../test_smoke_test/syntax_error_test.broken_dart | 2 +- dev/bots/setup.sh | 5 ----- dev/bots/test.sh | 5 ----- 10 files changed, 8 insertions(+), 18 deletions(-) delete mode 100755 dev/bots/setup.sh delete mode 100755 dev/bots/test.sh diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ff9a0cca25c..ffb93f09bc4 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -103,7 +103,7 @@ Flutter tests use [package:flutter_test](https://github.com/flutter/flutter/tree `flutter test` runs tests inside the flutter shell. -To run all the tests for the entire Flutter repository, the same way that Travis runs them, run `dev/bots/test.sh`. +To run all the tests for the entire Flutter repository, the same way that Travis runs them, run `dart dev/bots/test.dart`. If you've built [your own flutter engine](#working-on-the-engine-and-the-framework-at-the-same-time), you can pass `--local-engine` to change what flutter shell `flutter test` uses. For example, if you built an engine in the `out/host_debug_unopt` directory, you can pass diff --git a/dev/automated_tests/test_smoke_test/README.md b/dev/automated_tests/test_smoke_test/README.md index b33bd3660e3..84d252c6db7 100644 --- a/dev/automated_tests/test_smoke_test/README.md +++ b/dev/automated_tests/test_smoke_test/README.md @@ -1,2 +1,2 @@ -This directory is used by //flutter/dev/bots/test.sh to verify that +This directory is used by //flutter/dev/bots/test.dart to verify that `flutter test` actually correctly fails when a test fails. diff --git a/dev/automated_tests/test_smoke_test/crash1_test.dart b/dev/automated_tests/test_smoke_test/crash1_test.dart index 5b624105cea..d403913f480 100644 --- a/dev/automated_tests/test_smoke_test/crash1_test.dart +++ b/dev/automated_tests/test_smoke_test/crash1_test.dart @@ -7,7 +7,7 @@ import 'dart:io' as system; import 'package:flutter_test/flutter_test.dart'; // this is a test to make sure our tests consider engine crashes to be failures -// see //flutter/dev/bots/test.sh +// see //flutter/dev/bots/test.dart void main() { test('test smoke test -- this test should fail', () async { diff --git a/dev/automated_tests/test_smoke_test/crash2_test.dart b/dev/automated_tests/test_smoke_test/crash2_test.dart index a185af553ce..2008592121b 100644 --- a/dev/automated_tests/test_smoke_test/crash2_test.dart +++ b/dev/automated_tests/test_smoke_test/crash2_test.dart @@ -5,7 +5,7 @@ import 'dart:io' as system; // this is a test to make sure our tests consider engine crashes to be failures -// see //flutter/dev/bots/test.sh +// see //flutter/dev/bots/test.dart void main() { system.Process.killPid(system.pid, system.ProcessSignal.SIGSEGV); diff --git a/dev/automated_tests/test_smoke_test/fail_test.dart b/dev/automated_tests/test_smoke_test/fail_test.dart index d7589c0be2f..c1d76a8bcc9 100644 --- a/dev/automated_tests/test_smoke_test/fail_test.dart +++ b/dev/automated_tests/test_smoke_test/fail_test.dart @@ -5,7 +5,7 @@ import 'package:flutter_test/flutter_test.dart'; // this is a test to make sure our tests actually catch failures -// see //flutter/dev/bots/test.sh +// see //flutter/dev/bots/test.dart void main() { test('test smoke test -- this test SHOULD FAIL', () async { diff --git a/dev/automated_tests/test_smoke_test/missing_import_test.broken_dart b/dev/automated_tests/test_smoke_test/missing_import_test.broken_dart index 5ad935e42a9..f085d84e38a 100644 --- a/dev/automated_tests/test_smoke_test/missing_import_test.broken_dart +++ b/dev/automated_tests/test_smoke_test/missing_import_test.broken_dart @@ -3,7 +3,7 @@ // found in the LICENSE file. // this is a test to make sure our tests consider syntax errors to be failures -// see //flutter/dev/bots/test.sh +// see //flutter/dev/bots/test.dart void main() { fail(); // inspired by https://github.com/flutter/flutter/issues/2698 diff --git a/dev/automated_tests/test_smoke_test/pass_test.dart b/dev/automated_tests/test_smoke_test/pass_test.dart index e98dee47b4e..87d863af6e5 100644 --- a/dev/automated_tests/test_smoke_test/pass_test.dart +++ b/dev/automated_tests/test_smoke_test/pass_test.dart @@ -5,7 +5,7 @@ import 'package:flutter_test/flutter_test.dart'; // this is a test to make sure our tests actually catch failures -// see //flutter/dev/bots/test.sh +// see //flutter/dev/bots/test.dart void main() { test('test smoke test -- this test should pass', () async { diff --git a/dev/automated_tests/test_smoke_test/syntax_error_test.broken_dart b/dev/automated_tests/test_smoke_test/syntax_error_test.broken_dart index c5c514bbb91..f63b64d9645 100644 --- a/dev/automated_tests/test_smoke_test/syntax_error_test.broken_dart +++ b/dev/automated_tests/test_smoke_test/syntax_error_test.broken_dart @@ -3,7 +3,7 @@ // found in the LICENSE file. // this is a test to make sure our tests consider syntax errors to be failures -// see //flutter/dev/bots/test.sh +// see //flutter/dev/bots/test.dart The challenge: demand satisfaction If they apologize, no need for further action. diff --git a/dev/bots/setup.sh b/dev/bots/setup.sh deleted file mode 100755 index 561b369fe59..00000000000 --- a/dev/bots/setup.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -# TODO(goderbauer): delete this when all callsites are updated to travis_setup.sh. - -./dev/bots/travis_setup.sh diff --git a/dev/bots/test.sh b/dev/bots/test.sh deleted file mode 100755 index c91a2ecdacd..00000000000 --- a/dev/bots/test.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -# TODO(goderbauer): delete this when all callsites are updated to test.dart. - -./bin/cache/dart-sdk/bin/dart ./dev/bots/test.dart