Windows (#27)

* Additions for windows

* clean up

* cleanup

* Review updates

* Changed pipe test to be slow

Author: mikkeldamsgaard

.github/workflows/ci.yml

@@ -19,7 +19,7 @@ jobs:
       - name: Setup constants
         shell: bash
         run: |
-          TOIT_VERSION=v2.0.0-alpha.21
+          TOIT_VERSION=v2.0.0-alpha.40
           echo "TOIT_VERSION=$TOIT_VERSION" >> $GITHUB_ENV
           export DOWNLOAD_DIR="${{ github.workspace }}/downloads"
           echo "DOWNLOAD_DIR=$DOWNLOAD_DIR" >> $GITHUB_ENV

src/directory.toit

@@ -135,7 +135,11 @@ realpath path:
   // Relative paths must be prepended with the current directory, and we can't
   // let the C realpath routine do that for us, because it doesn't understand
   // what our current directory is.
-  if not path.starts_with "/": path = "$cwd/$path"
+  if platform == PLATFORM_WINDOWS:
+    if not path.starts_with "\\" or path.size <= 2 or path[1..2] != ":\\":
+      path = "$cwd\\$path"
+  else:
+    if not path.starts_with "/": path = "$cwd/$path"
   #primitive.file.realpath
 
 // Get the current working directory.  Like the 'pwd' command, this works by

src/pipe.toit

@@ -326,7 +326,10 @@ If the program run by the shell dies with a signal then the exit value is 128 +
   the signal number.
 */
 system command -> int?:
-  return run_program ["/bin/sh", "-c", command]
+  if platform == PLATFORM_WINDOWS:
+    return run_program ["cmd", "/s", "/c",  command]
+  else:
+    return run_program ["/bin/sh", "-c", command]
 
 run_program command arg1 -> int?:
   return run_program [command, arg1]

tests/fail.cmake

@@ -16,12 +16,3 @@
 set(FAILING_TESTS
 )
 
-if ("${CMAKE_SYSTEM_NAME}" STREQUAL "Windows" OR "${CMAKE_SYSTEM_NAME}" STREQUAL "MSYS")
-  list(APPEND FAILING_TESTS
-    ${TEST_PREFIX}/tests/file_test.toit
-    ${TEST_PREFIX}/tests/pipe_test.toit
-    ${TEST_PREFIX}/tests/pipe2_test.toit
-    ${TEST_PREFIX}/tests/fork_stress_test_slow.toit
-  )
-endif()
-

tests/file_test.toit

@@ -32,13 +32,14 @@ main:
   expect_file_not_found: file.Stream "mkfxz.not_there" file.RDONLY
   expect_invalid_argument: file.Stream "any name" file.CREAT       // Can't create a file without permissions.
 
-  open_file := file.Stream.for_read "/dev/null"
+  nul_device := (platform == PLATFORM_WINDOWS ? "\\\\.\\NUL" : "/dev/null")
+  open_file := file.Stream.for_read nul_device
   byte_array := open_file.read
   expect (not byte_array)
   open_file.close
   expect_already_closed: open_file.close
 
-  open_file = file.Stream "/dev/null" file.RDONLY
+  open_file = file.Stream nul_device file.RDONLY
   byte_array = open_file.read
   expect (not byte_array)
   open_file.close
@@ -69,7 +70,7 @@ main:
         test_out.write test_contents
         test_out.close
 
-        for i := 0; i < 10000; i++:
+        10000.repeat:
           file.read_content filename
 
         read_back := (file.read_content filename).to_string
@@ -120,28 +121,31 @@ main:
 
       expect (not file.size filename)
 
-      try:
-        file.write_content test_contents --path=filename --permissions=(6 << 6)
-        read_back := (file.read_content filename).to_string
-        expect_equals test_contents read_back
-        stats := file.stat filename
-        // We can't require that the permissions are exactly the same (as the umask
-        // might clear some bits).
-        expect_equals (6 << 6) ((6 << 6) | stats[file.ST_MODE])
-      finally:
-        file.delete filename
+      // Permissions does not quite work on windows
+      if platform != PLATFORM_WINDOWS:
+        try:
+          file.write_content test_contents --path=filename --permissions=(6 << 6)
+          read_back := (file.read_content filename).to_string
+          expect_equals test_contents read_back
+          stats := file.stat filename
+          // We can't require that the permissions are exactly the same (as the umask
+          // might clear some bits).
+          expect_equals (6 << 6) ((6 << 6) | stats[file.ST_MODE])
+        finally:
+          file.delete filename
 
       expect (not file.size filename)
 
       cwd_path := cwd
 
-      chdir dirname
+      path_sep := platform == PLATFORM_WINDOWS ? "\\" : "/"
 
-      expect_equals "$cwd_path/$dirname" cwd
+      chdir dirname
+      expect_equals "$cwd_path$path_sep$dirname" cwd
 
-      expect_equals "$cwd_path/$dirname" (realpath ".")
+      expect_equals "$cwd_path$path_sep$dirname" (realpath ".")
       expect_equals "$cwd_path" (realpath "..")
-      expect_equals "$cwd_path/$dirname" (realpath "../$dirname")
+      expect_equals "$cwd_path$path_sep$dirname" (realpath "../$dirname")
       expect_equals "$cwd_path" (realpath "../$dirname/..")
       expect_equals null (realpath "fætter");
 

tests/fork_stress_test_slow.toit

@@ -6,6 +6,7 @@ import host.pipe
 import reader show BufferedReader
 import monitor
 import expect show *
+import writer show Writer
 
 class Stress:
   executable ::= ?
@@ -29,11 +30,12 @@ class Stress:
     pipe.dont_wait_for pid
     channel.send "$id: forked"
 
+    pipe_writer := Writer to
     // Stress pipes.
     LINES_COUNT ::= 500
     for i := 0; i < LINES_COUNT; i++:
-      to.write "line$i\n"
-    to.close
+      pipe_writer.write "line$i\n"
+    pipe_writer.close
 
     reader := BufferedReader from
     read_counter := 0
@@ -51,7 +53,7 @@ class Stress:
 logs := []
 
 main:
-  stress := Stress "/bin/cat"
+  stress := Stress "cat"
 
   now_us := Time.monotonic_us
   counter := 0

tests/pipe2_test.toit

@@ -37,8 +37,8 @@ test_exit_signal sleep_time/int:
     pipe.PIPE_CREATED  // stdin
     pipe.PIPE_CREATED  // stdiout
     pipe.PIPE_CREATED  // stderr
-    "/bin/cat"
-    ["/bin/cat"]
+    "cat"
+    ["cat"]
 
   pid := pipes[3]
 

tests/pipe_test.toit renamed to tests/pipe_test_slow.toit

@@ -15,31 +15,42 @@ expect_error name [code]:
 
 expect_file_not_found cmd [code]:
   if (cmd.index_of " ") == -1:
-    expect_error "Error trying to run '$cmd' using \$PATH: No such file or directory" code
+    if platform == PLATFORM_WINDOWS:
+      expect_error "Error trying to run '$cmd' using \$PATH: FILE_NOT_FOUND" code
+    else:
+      expect_error "Error trying to run '$cmd' using \$PATH: No such file or directory" code
   else:
-    expect_error "Error trying to run executable with a space in the filename: '$cmd': No such file or directory" code
+    if platform == PLATFORM_WINDOWS:
+      expect_error "Error trying to run executable with a space in the filename: '$cmd': FILE_NOT_FOUND" code
+    else:
+      expect_error "Error trying to run executable with a space in the filename: '$cmd': No such file or directory" code
+
+if_windows windows unix:
+  if platform == PLATFORM_WINDOWS: return windows
+  return unix
 
 main:
   // This test does not work on ESP32 since you can't launch subprocesses.
-  if platform == "FreeRTOS": return
+  if platform == PLATFORM_FREERTOS: return
 
   print " ** Some child processes will print errors on stderr during **"
   print " ** this test.  This is harmless and expected.              **"
-
   pipe_large_file
   write_closed_stdin_exception
 
   expect_equals
     0
     pipe.system "true"
 
+  simple_ls_command := if_windows "dir %ComSpec%" "ls /bin/sh"
   expect_equals
     0
-    pipe.system "ls /bin/sh"
+    pipe.system
+      simple_ls_command
 
   // run_program does not parse the command line, splitting at spaces, so it's
   // looking for a single program of the name "ls /bin/sh".
-  expect_file_not_found "ls /bin/sh": pipe.run_program "ls /bin/sh"
+  expect_file_not_found simple_ls_command: pipe.run_program simple_ls_command
 
   // There's no such program as ll.
   expect_file_not_found "ll": pipe.run_program "ll" "/bin/sh"
@@ -68,6 +79,7 @@ main:
   expect_file_not_found no_exist_cmd : pipe.to no_exist_cmd
 
   tmpdir := mkdtemp "/tmp/toit_file_test_"
+  old_current_directory := cwd
 
   try:
     chdir tmpdir
@@ -88,12 +100,19 @@ main:
       chdir dirname
       go_up = true
 
-      p = pipe.from "shasum" filename
       output := ""
-      while byte_array := p.read:
-        output += byte_array.to_string
+      if platform == PLATFORM_WINDOWS:
+        p = pipe.from "certutil" "-hashfile" filename
+        while byte_array := p.read:
+          output += byte_array.to_string
+
+        expect output == "SHA1 hash of $filename:\r\n2dcc8e172c72f3d6937d49be7cf281067d257a62\r\nCertUtil: -hashfile command completed successfully.\r\n"
+      else:
+        p = pipe.from "shasum" filename
+        while byte_array := p.read:
+          output += byte_array.to_string
 
-      expect output == "2dcc8e172c72f3d6937d49be7cf281067d257a62  $filename\n"
+        expect output == "2dcc8e172c72f3d6937d49be7cf281067d257a62  $filename\n"
 
       chdir ".."
       go_up = false
@@ -107,15 +126,26 @@ main:
   finally:
     rmdir --recursive tmpdir
 
-  expect_error "shasum: exited with status 1":
-    p := pipe.from "shasum" "file_that_doesn't exist"
-    while p.read:
-      // nothing
+  chdir old_current_directory
+
+  if platform == PLATFORM_WINDOWS:
+    expect_error "certutil: exited with status 2":
+      p := pipe.from "certutil" "file_that_doesn't exist"
+      while p.read:
+        // Do nothing.
+
+    expect_error "certutil: exited with status 2":
+      sum := pipe.backticks "certutil" "file_that_doesn't exist"
+  else:
+    expect_error "shasum: exited with status 1":
+      p := pipe.from "shasum" "file_that_doesn't exist"
+      while p.read:
+        // Do nothing.
 
-  expect_error "shasum: exited with status 1":
-    sum := pipe.backticks "shasum" "file_that_doesn't exist"
+    expect_error "shasum: exited with status 1":
+      sum := pipe.backticks "shasum" "file_that_doesn't exist"
 
-  tar_exit_code := (platform == "Linux") ? 2 : 1
+  tar_exit_code := (platform == PLATFORM_LINUX) ? 2 : 1
   expect_error "tar: exited with status $tar_exit_code":
     p := pipe.to "tar" "-xvf" "-" "foo.txt"
     p.close  // Close without sending a valid tar file.