Merge pull request #1286 from GaloisInc/at-windows-tests

Re-enable tests on Windows

.github/workflows/ci.yml

@@ -214,7 +214,7 @@ jobs:
       matrix:
         suite: [test-lib]
         target: ${{ fromJson(needs.build.outputs.test-lib-json) }}
-        os: [ubuntu-latest, macos-latest] # , windows-latest]
+        os: [ubuntu-latest, macos-latest, windows-latest]
         continue-on-error: [false]
         include:
           - suite: rpc

cryptol/REPL/Haskeline.hs

@@ -99,7 +99,7 @@ getInputLines :: String -> InputT REPL NextLine
 getInputLines = handleInterrupt (MTL.lift (handleCtrlC Interrupted)) . loop []
   where
   loop ls prompt =
-    do mb <- getInputLine prompt
+    do mb <- fmap (filter (/= '\r')) <$> getInputLine prompt
        let newPropmpt = map (\_ -> ' ') prompt
        case mb of
          Nothing -> return NoMoreLines

tests/modsys/T16.icry.stdout.mingw32

@@ -5,5 +5,5 @@ Loading module T16::B
 
 [error] at .\T16\B.cry:5:5--5:11
     Multiple definitions for symbol: update
-    (at Cryptol:894:11--894:17, update)
+    (at Cryptol:899:11--899:17, update)
     (at .\T16\A.cry:3:1--3:7, T16::A::update)

tests/regression/negshift.icry

@@ -1,4 +1,4 @@
 :l negshift.cry
 :set tests=1000
 :check
-:prove
+:prove