Add further archs for testing (#24)

Add testing for non-threaded x86_64, and i386 versions and remove references to travis_fold directives in testing.

original commit: 441cdb166081e96eaecd513d5f13a8796fd451b4
This commit is contained in:
Paulo Matos 2020-05-18 13:19:46 +02:00 committed by GitHub
parent 605ae48f24
commit a8b3c8b608
4 changed files with 15 additions and 32 deletions

View File

@ -1,10 +1,9 @@
#!/bin/bash #!/bin/bash
set -e -o pipefail set -e -o pipefail
echo 'travis_fold:start:build'
echo Building Chez Scheme... echo Building Chez Scheme...
./configure -m=$TARGET_MACHINE ./configure -m=$MACH
make make
case $TARGET_MACHINE in case $MACH in
*a6nt) *a6nt)
curl -Ls https://github.com/burgerrg/win-iconv/releases/download/v0.0.9/iconv-x64.dll > $TARGET_MACHINE/bin/$TARGET_MACHINE/iconv.dll curl -Ls https://github.com/burgerrg/win-iconv/releases/download/v0.0.9/iconv-x64.dll > $TARGET_MACHINE/bin/$TARGET_MACHINE/iconv.dll
;; ;;
@ -12,4 +11,3 @@ case $TARGET_MACHINE in
curl -Ls https://github.com/burgerrg/win-iconv/releases/download/v0.0.9/iconv-x86.dll > $TARGET_MACHINE/bin/$TARGET_MACHINE/iconv.dll curl -Ls https://github.com/burgerrg/win-iconv/releases/download/v0.0.9/iconv-x86.dll > $TARGET_MACHINE/bin/$TARGET_MACHINE/iconv.dll
;; ;;
esac esac
echo 'travis_fold:end:build'

View File

@ -1,19 +0,0 @@
#!/bin/bash -v
cd ..
case $TARGET_MACHINE in
*i3le|ti3le) INST=i386;;
*a6le|ta6le) INST=x86_64;;
*)
esac
curl -L -o installer.sh http://www.cs.utah.edu/plt/snapshots/current/installers/min-racket-current-${INST}-linux-precise.sh
sh installer.sh --in-place --dest $HOME/racket/
$HOME/racket/bin/racket -v
$HOME/racket/bin/raco pkg install -i --auto -D cs-bootstrap
export MACH=$TARGET_MACHINE
cd ChezScheme
$HOME/racket/bin/racket -l cs-bootstrap

View File

@ -1,9 +1,7 @@
#!/bin/bash #!/bin/bash
runmats() { runmats() {
echo travis_fold:start:mats
echo make allxhelp "$@" echo make allxhelp "$@"
make -C ${TARGET_MACHINE}/mats allxhelp "$@" 2>&1 | tee -a Make.out | grep '^matting ' make -C ${MACH}/mats allxhelp "$@" 2>&1 | tee -a Make.out | grep '^matting '
echo travis_fold:end:mats
} }
# Split these out so that we get output every 10 minutes on Windows builds. # Split these out so that we get output every 10 minutes on Windows builds.
@ -12,9 +10,9 @@ runmats o=3
runmats o=3 cp0=t runmats o=3 cp0=t
runmats o=3 cp0=t eval=interpret runmats o=3 cp0=t eval=interpret
if [ -f ${TARGET_MACHINE}/mats/summary ]; then if [ -f ${MACH}/mats/summary ]; then
cat ${TARGET_MACHINE}/mats/summary cat ${MACH}/mats/summary
diff -q .github/scripts/summary ${TARGET_MACHINE}/mats/summary diff -q .github/scripts/summary ${MACH}/mats/summary
exit $? exit $?
else else
exit 1 exit 1

View File

@ -10,12 +10,18 @@ jobs:
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
mach: ['ta6le'] mach: ['i3le', 'ti3le', 'a6le', 'ta6le']
env: env:
TARGET_MACHINE: ${{ matrix.mach }} MACH: ${{ matrix.mach }}
steps: steps:
- uses: Bogdanp/setup-racket@v0.8
with:
distribution: 'minimal' # minimal is enough
variant: 'CS' # lets dog-food CS
version: 'current'
packages: 'cs-bootstrap'
- uses: actions/checkout@v2 - uses: actions/checkout@v2
with: with:
submodules: 'recursive' submodules: 'recursive'
@ -33,7 +39,7 @@ jobs:
sudo apt-get update sudo apt-get update
sudo apt-get install -y libncurses5-dev uuid-dev libssl-dev sudo apt-get install -y libncurses5-dev uuid-dev libssl-dev
- name: Build bootfiles - name: Build bootfiles
run: .github/scripts/dobootfile.sh run: racket -l cs-bootstrap
- name: Build Chez - name: Build Chez
run: .github/scripts/build.sh run: .github/scripts/build.sh
- name: Test Chez - name: Test Chez