From 76e5a42634a181f506bd8ed441775ba34d724196 Mon Sep 17 00:00:00 2001 From: Nico Simoski Date: Tue, 25 Mar 2025 15:04:26 +0100 Subject: [PATCH 1/4] Added command to run the automated tests on ecl --- test.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/test.sh b/test.sh index 5c33b94..0e551f8 100755 --- a/test.sh +++ b/test.sh @@ -23,3 +23,9 @@ sbcl --noinform \ --eval "(ql:quickload :com.inuoe.jzon-tests)" \ --eval "$test_exp" +ecl --eval "(load #p\"~/quicklisp/setup.lisp\")" \ + --eval "(asdf:load-asd #p\"$jzon_asd\")" \ + --eval "(asdf:load-asd #p\"$jzon_test_asd\")" \ + --eval "(ql:quickload :com.inuoe.jzon-tests)" \ + --eval "(com.inuoe.jzon-tests:main)" \ + --eval "(quit)" From 4f36db2bef237f96c0a046184f6d0adb255a2f6a Mon Sep 17 00:00:00 2001 From: Nico Simoski Date: Tue, 25 Mar 2025 15:11:24 +0100 Subject: [PATCH 2/4] Added flag for ECL to not look for initialization files --- test.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test.sh b/test.sh index 0e551f8..ad56069 100755 --- a/test.sh +++ b/test.sh @@ -23,7 +23,8 @@ sbcl --noinform \ --eval "(ql:quickload :com.inuoe.jzon-tests)" \ --eval "$test_exp" -ecl --eval "(load #p\"~/quicklisp/setup.lisp\")" \ +ecl --norc \ + --eval "(load #p\"~/quicklisp/setup.lisp\")" \ --eval "(asdf:load-asd #p\"$jzon_asd\")" \ --eval "(asdf:load-asd #p\"$jzon_test_asd\")" \ --eval "(ql:quickload :com.inuoe.jzon-tests)" \ From 43c1acc2ba12d2b0d64e78fa35529ab1140b9b09 Mon Sep 17 00:00:00 2001 From: Nico Simoski Date: Wed, 26 Mar 2025 15:15:00 +0100 Subject: [PATCH 3/4] Added portable test-expression --- test.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/test.sh b/test.sh index ad56069..d07f61a 100755 --- a/test.sh +++ b/test.sh @@ -12,6 +12,12 @@ test_exp=" (sb-ext:exit :code -1073741510 :abort t))) " +portable_test_exp=" +(progn (handler-case (uiop:quit (apply #'com.inuoe.jzon-tests:main (uiop:command-line-arguments))) + (error () + (uiop:quit 2)))) +" + sbcl --noinform \ --end-runtime-options \ --no-sysinit \ @@ -28,5 +34,4 @@ ecl --norc \ --eval "(asdf:load-asd #p\"$jzon_asd\")" \ --eval "(asdf:load-asd #p\"$jzon_test_asd\")" \ --eval "(ql:quickload :com.inuoe.jzon-tests)" \ - --eval "(com.inuoe.jzon-tests:main)" \ - --eval "(quit)" + --eval "$portable_test_exp" From e42da4ae6c96b1f94488d7feb4718a3236872bb9 Mon Sep 17 00:00:00 2001 From: Nico Simoski Date: Wed, 26 Mar 2025 15:24:51 +0100 Subject: [PATCH 4/4] Ported updates of test.sh to test.bat --- test.bat | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/test.bat b/test.bat index 990e23c..522d701 100644 --- a/test.bat +++ b/test.bat @@ -16,6 +16,11 @@ (sb-sys:interactive-interrupt ()^ (sb-ext:exit :code -1073741510 :abort t))) +@set PORTABLE_TEST_EXP=^ +(progn (handler-case (uiop:quit (apply #'com.inuoe.jzon-tests:main (uiop:command-line-arguments)))^ + (error ()^ + (uiop:quit 2)))) + @sbcl^ --noinform^ --end-runtime-options^ @@ -29,4 +34,13 @@ --eval "%TEST_EXP%" @if %errorlevel% neq 0 exit /b %errorlevel% +@ecl^ + --norc^ + --eval "(load """"~/quicklisp/setup.lisp"""")"^ + --eval "(asdf:load-asd #p""%JZON_ASD_E%\"")"^ + --eval "(asdf:load-asd #p""%JZON_TESTS_ASD_E%\"")"^ + --eval "(ql:quickload '#:com.inuoe.jzon-tests)"^ + --eval "%PORTABLE_TEST_EXP%" +@if %errorlevel% neq 0 exit /b %errorlevel% + @endlocal