Issue #1094: changes from master moved to pre-nnbd for LibTests/io/Pr…

…ocess

LibTest/io/Process/exitCode_A01_t02.dart

@@ -40,13 +40,12 @@ String command;
 List<String> args;
 
 void setCommand() {
-  if (Platform.isLinux) {
-    command = 'sleep';
-    args = ['5'];
-  }
   if (Platform.isWindows) {
     command = 'ping';
     args = ['127.0.0.1 -n 6 > nul'];
+  } else {
+    command = 'sleep';
+    args = ['5'];
   }
 }
 
@@ -58,7 +57,7 @@ main() {
 
     process.exitCode.then((int value) {
       if (Platform.isWindows) {
-        Expect.equals(1, value);
+        Expect.isTrue(value == 1 || value == -1);
       } else if (Platform.isLinux || Platform.isMacOS) {
         Expect.equals(-15, value);
       }

LibTest/io/Process/killPid_A01_t01.dart

@@ -27,13 +27,12 @@ String command;
 List<String> args;
 
 void setCommand() {
-  if (Platform.isLinux) {
-    command = 'sleep';
-    args = ['5'];
-  }
   if (Platform.isWindows) {
     command = 'ping';
     args = ['127.0.0.1 -n 6 > nul'];
+  } else {
+    command = 'sleep';
+    args = ['5'];
   }
 }
 

LibTest/io/Process/killPid_A01_t02.dart

@@ -27,13 +27,12 @@ String command;
 List<String> args;
 
 void setCommand() {
-  if (Platform.isLinux) {
-    command = 'sleep';
-    args = ['5'];
-  }
   if (Platform.isWindows) {
     command = 'ping';
     args = ['127.0.0.1 -n 6 > nul'];
+  } else {
+    command = 'sleep';
+    args = ['5'];
   }
 }
 

LibTest/io/Process/kill_A01_t01.dart

@@ -36,13 +36,12 @@ String command;
 List<String> args;
 
 void setCommand() {
-  if (Platform.isLinux) {
-    command = 'sleep';
-    args = ['5'];
-  }
   if (Platform.isWindows) {
     command = 'ping';
     args = ['127.0.0.1 -n 6 > nul'];
+  } else {
+    command = 'sleep';
+    args = ['5'];
   }
 }
 

LibTest/io/Process/kill_A01_t02.dart

@@ -25,49 +25,19 @@
 /// completes with the exit code 0 when the process completes.
 /// @author [email protected]
 
-import 'dart:convert';
 import "dart:io";
 import "../../../Utils/expect.dart";
 
-String command;
-List<String> args;
-
-void setCommand() {
-  if (Platform.isLinux) {
-    command = 'echo';
-    args = ['-start'];
-  }
-  if (Platform.isWindows) {
-    command = Platform.resolvedExecutable;
-    args = ['--version'];
-  }
-}
-
 main() {
-  setCommand();
+  String command = Platform.resolvedExecutable;
+  List<String> args = [...Platform.executableArguments, '--version'];
   asyncStart();
   Process.start(command, args).then((Process process) {
-
     process.exitCode.then((int value) {
-      Expect.equals(0, value);
       bool pKill = process.kill();
       Expect.isFalse(pKill);
-      if (Platform.isWindows) {
-        asyncEnd();
-      }
+      Expect.equals(0, value);
+      asyncEnd();
     });
-
-    if (!Platform.isWindows) {
-      process.stdout.toList().then((List outList) {
-        Utf8Decoder decode = new Utf8Decoder();
-        String decoded = decode.convert(outList[0]);
-        Expect.isTrue(decoded.contains("-start"));
-      }).then((_) {
-        process.stderr.toList().then((List errList) {
-          Expect.equals(0, errList.length);
-          asyncEnd();
-        });
-      });
-    }
   });
 }

LibTest/io/Process/runSync_A01_t01.dart

@@ -38,13 +38,12 @@ String command;
 List<String> args;
 
 void setCommand() {
-  if (Platform.isLinux) {
-    command = 'echo';
-    args = ['abc'];
-  }
   if (Platform.isWindows) {
     command = Platform.resolvedExecutable;
     args = ['--version'];
+  } else {
+    command = 'echo';
+    args = ['abc'];
   }
 }
 

LibTest/io/Process/runSync_A02_t01.dart

@@ -30,17 +30,16 @@ import "dart:convert";
 import "dart:io";
 import "../../../Utils/expect.dart";
 
-String command;
-List<String> args;
+String command = "";
+List<String> args = new List<String>.empty(growable: true);
 
 void setCommand() {
-  if (Platform.isLinux) {
-    command = 'echo';
-    args = ['abc'];
-  }
   if (Platform.isWindows) {
     command = Platform.resolvedExecutable;
     args = ['--version'];
+  } else {
+    command = 'echo';
+    args = ['abc'];
   }
 }
 

LibTest/io/Process/runSync_A02_t02.dart

@@ -6,7 +6,7 @@
 
 /// @assertion
 /// ProcessResult runSync(
-///     String executable,
+///     String exec utable,
 ///     List<String> arguments, {
 ///     String workingDirectory,
 ///     Map<String, String> environment,
@@ -30,17 +30,16 @@ import "dart:convert";
 import "dart:io";
 import "../../../Utils/expect.dart";
 
-String command;
-List<String> args;
+String command = "";
+List<String> args = new List<String>.empty(growable: true);
 
 void setCommand() {
-  if (Platform.isLinux) {
-    command = 'echo';
-    args = ['abc'];
-  }
   if (Platform.isWindows) {
     command = Platform.resolvedExecutable;
     args = ['--version'];
+  } else {
+    command = 'echo';
+    args = ['abc'];
   }
 }
 

LibTest/io/Process/run_A01_t01.dart

@@ -36,13 +36,12 @@ String command;
 List<String> args;
 
 void setCommand() {
-  if (Platform.isLinux) {
-    command = 'echo';
-    args = ['abc'];
-  }
   if (Platform.isWindows) {
     command = Platform.resolvedExecutable;
     args = ['--version'];
+  } else {
+    command = 'echo';
+    args = ['abc'];
   }
 }
 

LibTest/io/Process/run_A01_t02.dart

@@ -32,14 +32,29 @@
 import "dart:io";
 import "../../../Utils/expect.dart";
 
-main() {
+runMain() {
   String executable = Platform.resolvedExecutable;
-  File file = new File.fromUri(Platform.script.resolve("start_A01_t01_lib.dart"));
+  String eScript = Platform.script.toString();
+
   asyncStart();
-  Process.run(executable, [file.absolute.path]).then((ProcessResult results) {
+  print(Platform.executableArguments);
+  Process.run(executable, [...Platform.executableArguments, eScript, "run"])
+      .then((ProcessResult results) {
     Expect.equals(0, results.exitCode);
-    Expect.equals("start_A01_t01_lib.dart run", results.stdout);
+    Expect.equals("Lily was here", results.stdout);
     Expect.equals("", results.stderr);
     asyncEnd();
   });
 }
+
+runProcess() {
+  stdout.write("Lily was here");
+}
+
+main(List<String> args) {
+  if (args.length > 0)
+    runProcess();
+  else {
+    runMain();
+  }
+}

LibTest/io/Process/run_A02_t01.dart

@@ -34,13 +34,12 @@ String command;
 List<String> args;
 
 void setCommand() {
-  if (Platform.isLinux) {
-    command = 'echo';
-    args = ['abc'];
-  }
   if (Platform.isWindows) {
     command = Platform.resolvedExecutable;
     args = ['--version'];
+  } else {
+    command = 'echo';
+    args = ['abc'];
   }
 }
 

LibTest/io/Process/run_A02_t02.dart

@@ -34,13 +34,12 @@ String command;
 List<String> args;
 
 void setCommand() {
-  if (Platform.isLinux) {
-    command = 'echo';
-    args = ['abc'];
-  }
   if (Platform.isWindows) {
     command = Platform.resolvedExecutable;
     args = ['--version'];
+  } else {
+    command = 'echo';
+    args = ['abc'];
   }
 }
 

LibTest/io/Process/start_A01_t01.dart

@@ -31,20 +31,34 @@ import "dart:convert";
 import "dart:io";
 import "../../../Utils/expect.dart";
 
-main() {
+runMain() {
   String executable = Platform.resolvedExecutable;
-  File file = new File.fromUri(Platform.script.resolve("start_A01_t01_lib.dart"));
+  String eScript = Platform.script.toString();
+
   asyncStart();
-  Process.start(executable, [file.path]).then((Process process) {
-    process.stdout.toList().then((List outList) {
-      Utf8Decoder decoder = new Utf8Decoder();
-      String decoded = decoder.convert(outList[0]);
-      Expect.equals("start_A01_t01_lib.dart run", decoded);
+  Process.start(executable, [...Platform.executableArguments, eScript, "run"])
+      .then((Process process) {
+    process.stdout.transform(utf8.decoder).transform(const LineSplitter()).
+          toList().then((List outList) {
+      Expect.equals("Lily was here", outList[0]);
     }).then((_) {
-      process.stderr.toList().then((List errList) {
+      process.stderr.transform(utf8.decoder).transform(const LineSplitter()).
+          toList().then((List errList) {
         Expect.equals(0, errList.length);
         asyncEnd();
       });
     });
   });
 }
+
+runProcess() {
+  stdout.write("Lily was here");
+}
+
+main(List<String> args) {
+  if (args.length > 0)
+    runProcess();
+  else {
+    runMain();
+  }
+}