Raymond Toy pushed to branch master at cmucl / cmucl
Commits:
-
f9ccc188
by Raymond Toy at 2023-08-21T18:03:25+00:00
-
eab9b876
by Raymond Toy at 2023-08-21T18:04:16+00:00
3 changed files:
Changes:
| ... | ... | @@ -62,7 +62,7 @@ linux:test: |
| 62 | 62 | - job: linux:build
|
| 63 | 63 | artifacts: true
|
| 64 | 64 | script:
|
| 65 | - - bin/run-tests.sh -l dist/bin/lisp 2>&1 | tee test.log
|
|
| 65 | + - bin/run-unit-tests.sh -l dist/bin/lisp 2>&1 | tee test.log
|
|
| 66 | 66 | |
| 67 | 67 | linux:ansi-test:
|
| 68 | 68 | stage: ansi-test
|
| ... | ... | @@ -75,14 +75,8 @@ linux:ansi-test: |
| 75 | 75 | # Needs artifacts from build (dist/)
|
| 76 | 76 | - job: linux:build
|
| 77 | 77 | artifacts: true
|
| 78 | - before_script:
|
|
| 79 | - - git clone https://gitlab.common-lisp.net/cmucl/ansi-test.git
|
|
| 80 | - - (cd ansi-test; git checkout cmucl-expected-failures)
|
|
| 81 | 78 | script:
|
| 82 | - - cd ansi-test
|
|
| 83 | - - make LISP="../dist/bin/lisp -batch -noinit -nositeinit"
|
|
| 84 | - # There should be no unexpected successes or failures; check these separately.
|
|
| 85 | - - grep -a 'No unexpected successes' test.out && grep -a 'No unexpected failures' test.out
|
|
| 79 | + - bin/run-ansi-tests.sh -l dist/bin/lisp
|
|
| 86 | 80 |
|
| 87 | 81 | linux:benchmark:
|
| 88 | 82 | stage: benchmark
|
| ... | ... | @@ -149,7 +143,7 @@ osx:test: |
| 149 | 143 | - job: osx:build
|
| 150 | 144 | artifacts: true
|
| 151 | 145 | script:
|
| 152 | - - bin/run-tests.sh -l dist/bin/lisp 2>&1 | tee test.log
|
|
| 146 | + - bin/run-unit-tests.sh -l dist/bin/lisp 2>&1 | tee test.log
|
|
| 153 | 147 | |
| 154 | 148 | osx:ansi-test:
|
| 155 | 149 | stage: ansi-test
|
| ... | ... | @@ -162,14 +156,8 @@ osx:ansi-test: |
| 162 | 156 | # Needs artifacts from build (dist/)
|
| 163 | 157 | - job: osx:build
|
| 164 | 158 | artifacts: true
|
| 165 | - before_script:
|
|
| 166 | - - /opt/local/bin/git clone https://gitlab.common-lisp.net/cmucl/ansi-test.git
|
|
| 167 | - - (cd ansi-test; /opt/local/bin/git checkout cmucl-expected-failures)
|
|
| 168 | 159 | script:
|
| 169 | - - cd ansi-test
|
|
| 170 | - - make LISP="../dist/bin/lisp -batch -noinit -nositeinit"
|
|
| 171 | - # There should be no unexpected successes or failures; check these separately.
|
|
| 172 | - - grep -a 'No unexpected successes' test.out && grep -a 'No unexpected failures' test.out
|
|
| 160 | + - bin/run-ansi-tests.sh -l dist/bin/lisp
|
|
| 173 | 161 |
|
| 174 | 162 | osx:benchmark:
|
| 175 | 163 | stage: benchmark
|
| 1 | +#! /bin/bash
|
|
| 2 | + |
|
| 3 | +# Run the ansi-tests.
|
|
| 4 | +#
|
|
| 5 | +# We need to check ou ansi-tests if we haven't already. We expect
|
|
| 6 | +# this to be run from the root of the cmucl git tree. We will check
|
|
| 7 | +# it out one level up from where we are.
|
|
| 8 | + |
|
| 9 | +usage() {
|
|
| 10 | + echo "run-ansi-tests.sh [?h] [-l lisp]"
|
|
| 11 | + echo " -l lisp Lisp to use for the tests; defaults to lisp"
|
|
| 12 | + echo " -h|? This help message"
|
|
| 13 | + echo ""
|
|
| 14 | + echo "Run the ansi-tests"
|
|
| 15 | + echo ""
|
|
| 16 | + echo "If ../ansi-test does not exist a clone is checked out there."
|
|
| 17 | + echo "Then the ansi-test is run in the clone using the given lisp."
|
|
| 18 | + exit 0;
|
|
| 19 | +}
|
|
| 20 | + |
|
| 21 | +LISP=lisp
|
|
| 22 | +while getopts "h?l:" arg
|
|
| 23 | +do
|
|
| 24 | + case $arg in
|
|
| 25 | + l) LISP="$PWD/$OPTARG" ;;
|
|
| 26 | + \?) usage ;;
|
|
| 27 | + h) usage ;;
|
|
| 28 | + esac
|
|
| 29 | +done
|
|
| 30 | + |
|
| 31 | +# Shift out the options
|
|
| 32 | +shift $[$OPTIND - 1]
|
|
| 33 | + |
|
| 34 | +set -x
|
|
| 35 | +if [ -d ../ansi-test ]; then
|
|
| 36 | + # We already have clone; make sure it's clean by stashing any changes.
|
|
| 37 | + (cd ../ansi-test; git stash)
|
|
| 38 | +else
|
|
| 39 | + (cd ../; git clone https://gitlab.common-lisp.net/cmucl/ansi-test.git)
|
|
| 40 | +fi
|
|
| 41 | + |
|
| 42 | +cd ../ansi-test
|
|
| 43 | +git checkout cmucl-expected-failures
|
|
| 44 | + |
|
| 45 | +make LISP="$LISP batch -noinit -nositeinit"
|
|
| 46 | +# There should be no unexpected successes or failures; check these separately
|
|
| 47 | +grep -a 'No unexpected successes' test.out && grep -a 'No unexpected failures' test.out
|
|
| 48 | + |