From 38e841fc5cb48a9239ac24362e82ed88734c8fdf Mon Sep 17 00:00:00 2001 From: Calvin Rose Date: Sat, 5 Apr 2025 20:52:47 -0500 Subject: [PATCH 1/2] Get rid of test error. --- test/suite-ev.janet | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/test/suite-ev.janet b/test/suite-ev.janet index cdd43ee8..b2d294a6 100644 --- a/test/suite-ev.janet +++ b/test/suite-ev.janet @@ -430,13 +430,7 @@ # Now do our telnet chat (def bob (assert (net/connect test-host test-port :stream))) (expect-read bob "Whats your name?\n") -(if (= :mingw (os/which)) - (net/write bob "bob") - (do - (def fbob (ev/to-file bob)) - (file/write fbob "bob") - (file/flush fbob) - (:close fbob))) +(net/write bob "bob") (expect-read bob "Welcome bob\n") (def alice (assert (net/connect test-host test-port))) (expect-read alice "Whats your name?\n") @@ -569,7 +563,8 @@ (ev/gather (os/proc-wait p) (ev/slurp (p :out)))) +(def data (string/replace-all "\r" "" data)) (assert (zero? exit-code) "subprocess ran") -(assert (deep= data @"hi\nthere\n") "output is correct") +(assert (= data "hi\nthere\n") "output is correct") (end-suite) From 332f123abe71d333209bc5e01197566ec8417a07 Mon Sep 17 00:00:00 2001 From: Calvin Rose Date: Sat, 5 Apr 2025 20:59:45 -0500 Subject: [PATCH 2/2] Replace if not errorlevel 0 with if errorlevel 1 The former is just bad syntax. --- build_win.bat | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/build_win.bat b/build_win.bat index 03829667..5a0da53e 100644 --- a/build_win.bat +++ b/build_win.bat @@ -41,34 +41,34 @@ if not exist build\boot mkdir build\boot @rem Build the bootstrap interpreter for %%f in (src\core\*.c) do ( %JANET_COMPILE% /DJANET_BOOTSTRAP /Fobuild\boot\%%~nf.obj %%f - @if not errorlevel 0 goto :BUILDFAIL + @if errorlevel 1 goto :BUILDFAIL ) for %%f in (src\boot\*.c) do ( %JANET_COMPILE% /DJANET_BOOTSTRAP /Fobuild\boot\%%~nf.obj %%f - @if not errorlevel 0 goto :BUILDFAIL + @if errorlevel 1 goto :BUILDFAIL ) %JANET_LINK% /out:build\janet_boot.exe build\boot\*.obj -@if not errorlevel 0 goto :BUILDFAIL +@if errorlevel 1 goto :BUILDFAIL build\janet_boot . > build\c\janet.c -@if not errorlevel 0 goto :BUILDFAIL +@if errorlevel 1 goto :BUILDFAIL @rem Build the sources %JANET_COMPILE% /Fobuild\janet.obj build\c\janet.c -@if not errorlevel 0 goto :BUILDFAIL +@if errorlevel 1 goto :BUILDFAIL %JANET_COMPILE% /Fobuild\shell.obj src\mainclient\shell.c -@if not errorlevel 0 goto :BUILDFAIL +@if errorlevel 1 goto :BUILDFAIL @rem Build the resources rc /nologo /fobuild\janet_win.res janet_win.rc -@if not errorlevel 0 goto :BUILDFAIL +@if errorlevel 1 goto :BUILDFAIL @rem Link everything to main client %JANET_LINK% /out:janet.exe build\janet.obj build\shell.obj build\janet_win.res -@if not errorlevel 0 goto :BUILDFAIL +@if errorlevel 1 goto :BUILDFAIL @rem Build static library (libjanet.lib) %JANET_LINK_STATIC% /out:build\libjanet.lib build\janet.obj -@if not errorlevel 0 goto :BUILDFAIL +@if errorlevel 1 goto :BUILDFAIL echo === Successfully built janet.exe for Windows === echo === Run 'build_win test' to run tests. == @@ -102,7 +102,7 @@ exit /b 0 :TEST for %%f in (test/suite*.janet) do ( janet.exe test\%%f - @if not errorlevel 0 goto TESTFAIL + @if errorlevel 1 goto TESTFAIL ) exit /b 0