[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 <nshahan@google.com> Auto-Submit: Mark Zhou <markzipan@google.com> Commit-Queue: Nicholas Shahan <nshahan@google.com>
This commit is contained in:
@@ -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;
|
||||
|
||||
@@ -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();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user