Retropikzel
/
scheme-venv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixing testing

This commit is contained in:
retropikzel 2026-01-27 08:09:19 +02:00
parent 297d743d73
commit 50820236cf
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Jenkinsfile vendored
View File

@ -30,7 +30,6 @@ pipeline {
stage("${SCHEME}") { stage("${SCHEME}") {
catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') { catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
sh "make SCHEME=${SCHEME} test-r6rs-script-docker | grep 'scheme-venv-script-test-success-Hello' || exit 1" sh "make SCHEME=${SCHEME} test-r6rs-script-docker | grep 'scheme-venv-script-test-success-Hello' || exit 1"
sh "tree testvenv"
} }
} }
} }
@ -44,7 +43,6 @@ pipeline {
stage("${SCHEME}") { stage("${SCHEME}") {
catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') { catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
sh "make SCHEME=${SCHEME} test-r6rs-compile-docker | grep 'scheme-venv-compile-test-success-Hello' || exit 1" sh "make SCHEME=${SCHEME} test-r6rs-compile-docker | grep 'scheme-venv-compile-test-success-Hello' || exit 1"
sh "tree testvenv"
} }
} }
} }
@ -58,7 +56,6 @@ pipeline {
stage("${SCHEME}") { stage("${SCHEME}") {
catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') { catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
sh "make SCHEME=${SCHEME} test-r7rs-script-docker | grep 'scheme-venv-script-test-success-Hello' || exit 1" sh "make SCHEME=${SCHEME} test-r7rs-script-docker | grep 'scheme-venv-script-test-success-Hello' || exit 1"
sh "tree testvenv"
} }
} }
} }
@ -72,7 +69,6 @@ pipeline {
stage("${SCHEME}") { stage("${SCHEME}") {
catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') { catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
sh "make SCHEME=${SCHEME} test-r7rs-compile-docker | grep 'scheme-venv-compile-test-success-Hello' || exit 1" sh "make SCHEME=${SCHEME} test-r7rs-compile-docker | grep 'scheme-venv-compile-test-success-Hello' || exit 1"
sh "tree testvenv"
} }
} }
} }

16
scheme-venv
View File

@ -222,11 +222,11 @@ else
chicken_version=$(csi -version | grep "Version" | awk '{split($0,a," "); split(a[2],b,"."); print(b[1])}') chicken_version=$(csi -version | grep "Version" | awk '{split($0,a," "); split(a[2],b,"."); print(b[1])}')
if [ "${chicken_version}" = "5" ]; then if [ "${chicken_version}" = "5" ]; then
#scheme_cmd="LD_LIBRARY_PATH=\"${venvpath}/lib\" csi -R r7rs -I \"${venvpath}/lib\" -script \"\${IF}\"" #scheme_cmd="LD_LIBRARY_PATH=\"${venvpath}/lib\" csi -R r7rs -I \"${venvpath}/lib\" -script \"\${IF}\""
scheme_cmd="echo \"Chicken script not yet supported\" && exit 1" scheme_cmd="echo \"Chicken script not supported\" && exit 1"
scheme_compile_cmd="csc -static -X r7rs -R r7rs -o \"\${OF}\" \"\${IF}\"" scheme_compile_cmd="csc -static -X r7rs -R r7rs -o \"\${OF}\" \"\${IF}\""
else else
#scheme_cmd="LD_LIBRARY_PATH=\"${venvpath}/lib\" csi -I \"${venvpath}/lib\" -script \"\${IF}\"" #scheme_cmd="LD_LIBRARY_PATH=\"${venvpath}/lib\" csi -I \"${venvpath}/lib\" -script \"\${IF}\""
scheme_cmd="echo \"Chicken script not yet supported\" && exit 1" scheme_cmd="echo \"Chicken script not supported\" && exit 1"
scheme_compile_cmd="csc -static -o \"\${OF}\" \"\${IF}\"" scheme_compile_cmd="csc -static -o \"\${OF}\" \"\${IF}\""
fi fi
;; ;;
@ -240,15 +240,15 @@ else
"gambit") "gambit")
scheme_cmd="gsi \"${venvpath}/lib/\" \"\${IF}\"" scheme_cmd="gsi \"${venvpath}/lib/\" \"\${IF}\""
#scheme_compile_cmd="gsc -o \"\${OF}\" -exe -nopreload \"${venvpath}/lib/\" \"\${IF}\"" #scheme_compile_cmd="gsc -o \"\${OF}\" -exe -nopreload \"${venvpath}/lib/\" \"\${IF}\""
scheme_compile_cmd="echo \"Gambit compiler not yet supported\" && exit 1" scheme_compile_cmd="echo \"Gambit compiler not supported\" && exit 1"
;; ;;
"gauche") "gauche")
scheme_cmd="gosh -r7 -I \"${venvpath}/lib\" \"\${IF}\"" scheme_cmd="gosh -r7 -I \"${venvpath}/lib\" \"\${IF}\""
;; ;;
"guile") "guile")
#scheme_cmd="guile --r7rs -x .sld -C \"${venvpath}/lib\" -L \"${venvpath}/lib\" -s \"\${IF}\"" #scheme_cmd="guile --r7rs -x .sld -C \"${venvpath}/lib\" -L \"${venvpath}/lib\" -s \"\${IF}\""
scheme_cmd="echo \"Guile script not yet supported\" && exit 1" scheme_cmd="echo \"Guile script not supported\" && exit 1"
scheme_compile_cmd="echo \"Guile compiler not yet supported\" && exit 1" scheme_compile_cmd="echo \"Guile compiler not supported\" && exit 1"
;; ;;
"kawa") "kawa")
scheme_cmd="kawa --r7rs --full-tailcalls -Dkawa.import.path=\"${venvpath}/lib/*.sld\" \"\${IF}\"" scheme_cmd="kawa --r7rs --full-tailcalls -Dkawa.import.path=\"${venvpath}/lib/*.sld\" \"\${IF}\""
@ -264,9 +264,9 @@ else
scheme_cmd="meevax -I \"${venvpath}/lib\" \"\${IF}\"" scheme_cmd="meevax -I \"${venvpath}/lib\" \"\${IF}\""
;; ;;
"mit-scheme") "mit-scheme")
#scheme_cmd="mit-scheme --prepend-library \"${venvpath}/lib\" --batch-mode --load \"\${IF}\" --eval \"(exit 0)\" --args" #scheme_cmd="mit-scheme --prepend-library \"${venvpath}/lib/\" --batch-mode --load \"\${IF}\" --eval \"(exit 0)\" --args"
scheme_cmd="echo \"MIT-scheme script not yet supported\" && exit 1" scheme_cmd="echo \"MIT-scheme script not supported\" && exit 1"
scheme_compile_cmd="echo \"MIT-scheme compile not yet supported\" && exit 1" scheme_compile_cmd="echo \"MIT-scheme compile not supported\" && exit 1"
;; ;;
"mosh") "mosh")
scheme_cmd="mosh --loadpath=\"${venvpath}/lib\" \"\${IF}\"" scheme_cmd="mosh --loadpath=\"${venvpath}/lib\" \"\${IF}\""