Merge pull request #1296 from melted/windows_ci_test

add tests to Windows CI

Author: melted

.github/workflows/ci-windows.yml

@@ -45,4 +45,4 @@ jobs:
         run: |
           scheme --version
       - name: Bootstrap and install
-        run: c:\msys64\usr\bin\bash -l -c "cd $env:PWD && make bootstrap && make install"
+        run: c:\msys64\usr\bin\bash -l -c "cd $env:PWD && make bootstrap && make bootstrap-test && make install"

libs/base/System/Directory.idr

@@ -10,7 +10,7 @@ support : String -> String
 support fn = "C:" ++ fn ++ ", libidris2_support"
 
 %foreign support "idris2_fileErrno"
-         "node:support:fileErrno,support_system_directory"
+         "node:support:fileErrno,support_system_file"
 prim__fileErrno : PrimIO Int
 
 returnError : HasIO io => io (Either FileError a)

libs/base/System/File.idr

@@ -34,7 +34,7 @@ prim__close : FilePtr -> PrimIO ()
 prim__error : FilePtr -> PrimIO Int
 
 %foreign support "idris2_fileErrno"
-         "node:lambda:()=>-BigInt(process.__lasterr.errno)"
+         "node:support:fileErrno,support_system_file"
 prim__fileErrno : PrimIO Int
 
 %foreign support "idris2_seekLine"

libs/test/Test/Golden.idr

@@ -264,17 +264,22 @@ Show Requirement where
 export
 checkRequirement : Requirement -> IO (Maybe String)
 checkRequirement req
-  = do let (envvar, paths) = requirement req
-       Just exec <- getEnv envvar | Nothing => pathLookup paths
-       pure (Just exec)
-
+  = if platformSupport req
+      then do let (envvar, paths) = requirement req
+              Just exec <- getEnv envvar | Nothing => pathLookup paths
+              pure (Just exec)
+      else pure Nothing
   where
     requirement : Requirement -> (String, List String)
     requirement C = ("CC", ["cc"])
     requirement Chez = ("CHEZ", ["chez", "chezscheme9.5", "scheme"])
     requirement Node = ("NODE", ["node"])
     requirement Racket = ("RACKET", ["racket"])
     requirement Gambit = ("GAMBIT", ["gsc"])
+    platformSupport : Requirement -> Bool
+    platformSupport C = not isWindows
+    platformSupport Racket = not isWindows
+    platformSupport _ = True
 
 export
 findCG : IO (Maybe String)

src/Compiler/ES/Node.idr

@@ -47,7 +47,8 @@ executeExpr c tmpDir tm
      Right () <- coreLift $ writeFile outn js
         | Left err => throw (FileErr outn err)
      node <- coreLift findNode
-     coreLift_ $ system (node ++ " " ++ outn)
+     quoted_node <- pure $ "\"" ++ node ++ "\"" -- Windows often have a space in the path.
+     coreLift_ $ system (quoted_node ++ " " ++ outn)
      pure ()
 
 ||| Codegen wrapper for Node implementation.

support/js/support_system_directory.js

@@ -1,12 +1,4 @@
-const support_system_directory_fs = require("fs")
-
-function support_system_directory_fileErrno(){
-  const n = process.__lasterr.errno;
-  switch(n){
-    case -17: return 4n;
-    default: return -BigInt(n)
-  }
-}
+const support_system_directory_fs = require("fs");
 
 function support_system_directory_changeDir(d){
   try{

support/js/support_system_file.js

@@ -1,5 +1,23 @@
 const support_system_file_fs = require('fs')
 
+
+function support_system_file_fileErrno(){
+  const n = process.__lasterr.errno || 0
+  if (process.platform == 'win32') {
+    // TODO: Add the error codes for the other errors
+    switch(n) {
+      case -4058: return 2n
+      case -4075: return 4n
+      default: return -BigInt(n)
+    }
+  } else {
+    switch(n){
+      case -17: return 4n
+      default: return -BigInt(n)
+    }
+  }
+}
+
 // like `readLine` without the overhead of copying characters.
 // returns int (success 0, failure -1) to align with the C counterpart.
 function support_system_file_seekLine (file_ptr) {
@@ -46,7 +64,7 @@ function support_system_file_getStr () {
 
 function support_system_file_openFile (n, m) {
   try {
-    const fd = support_system_file_fs.openSync(n, m)
+    const fd = support_system_file_fs.openSync(n, m.replace('b', ''))
     return { fd: fd, buffer: Buffer.alloc(0), name: n, eof: false }
   } catch (e) {
     process.__lasterr = e

tests/chez/chez016/run

@@ -1,20 +1,8 @@
-# This test needs to run `idris2` from a sub-folder.
-# Split path to `idris2` executable into dirname and basename.
-# If the path is relative, add `..` to compensate for running `idris2` in a sub-folder.
-case "$1" in
-  /*)
-    # Absolute path
-    IDRIS2_DIR="$(dirname "$1")"
-    ;;
-  *)
-    # Relative path
-    IDRIS2_DIR="../$(dirname "$1")"
-    ;;
-esac
+# This test needs to run `idris2` from a sub-folder. Get the absolute path.
 
-IDRIS2_EXEC="$(basename "$1")"
+IDRIS2_EXEC="$(realpath "$1")"
 
 cd "folder with spaces" || exit
 
-"$IDRIS2_DIR/$IDRIS2_EXEC" --no-color --console-width 0 --no-banner Main.idr < ../input
+"$IDRIS2_EXEC" --no-color --console-width 0 --no-banner Main.idr < ../input
 rm -rf build