From 6281f58c583d64b9e1beb698492dbfa0452929e9 Mon Sep 17 00:00:00 2001 From: MarkZ Date: Tue, 10 Sep 2024 20:47:38 +0000 Subject: [PATCH] [ddc] Removing --minimal from reload suite diff logic This was causing diff discrepancies on Mac vs Linux Change-Id: I2b67b51d1aab959fa99de916d40d282fc5d19f8e Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/384310 Reviewed-by: Nicholas Shahan Auto-Submit: Mark Zhou Commit-Queue: Nicholas Shahan --- pkg/dev_compiler/test/hot_reload_suite.dart | 8 +------- tests/hot_reload/framework_timing_test/main.2.dart | 6 +++--- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/pkg/dev_compiler/test/hot_reload_suite.dart b/pkg/dev_compiler/test/hot_reload_suite.dart index bf4bbd44338..48537087773 100644 --- a/pkg/dev_compiler/test/hot_reload_suite.dart +++ b/pkg/dev_compiler/test/hot_reload_suite.dart @@ -766,13 +766,7 @@ String _diffWithFileUris(Uri file1, Uri file2, {String label = '', bool commented = true, bool trimHeaders = true}) { final file1Path = file1.toFilePath(); final file2Path = file2.toFilePath(); - final diffArgs = [ - '-du', - '--width=120', - '--expand-tabs', - file1Path, - file2Path - ]; + final diffArgs = ['-u', '--width=120', '--expand-tabs', file1Path, file2Path]; _debugPrint("Running diff with 'diff ${diffArgs.join(' ')}'.", label: label); final diffProcess = Process.runSync('diff', diffArgs); final errOutput = diffProcess.stderr as String; diff --git a/tests/hot_reload/framework_timing_test/main.2.dart b/tests/hot_reload/framework_timing_test/main.2.dart index 24750b7c412..dc81e6ae8f9 100644 --- a/tests/hot_reload/framework_timing_test/main.2.dart +++ b/tests/hot_reload/framework_timing_test/main.2.dart @@ -54,12 +54,12 @@ void main() { + Expect.equals(2, hotRestartGeneration); }).then((_) { - Expect.equals(1, hotRestartGeneration); -- }); ++ Expect.equals(2, hotRestartGeneration); + }); - Future.delayed(Duration(seconds: 5), () { - throw Exception('Future from main.1.dart before hot restart. ' - 'This should never run.'); -+ Expect.equals(2, hotRestartGeneration); - }); +- }); - hotRestart(); }