Raymond Toy pushed to branch master at cmucl / cmucl

Commits: 27115bdc by Raymond Toy at 2024-05-28T06:50:11-07:00 Update ansi-test on the correct branch.

Previously, if the ansi-test directory existed, we did a `git pull --rebase` on whatever branch we happened to be on. Then a bit later we switched to the desired branch. This meant that we updated some branch, but then didn't get the updates for the branch we actually wanted to sue.

Modify script so that we change branches to the desired branch before pulling new changes.

Since the branch name is used in a couple of places, add an envvar to hold the name of the desired branch.

- - - - -

1 changed file:

- bin/run-ansi-tests.sh

Changes:

===================================== bin/run-ansi-tests.sh ===================================== @@ -31,20 +31,24 @@ done # Shift out the options shift $[$OPTIND - 1]

+# Branch to use for tests +# +# Use branch cmucl-expected-failures in general since this branch +# generally has the list of expected failures. This is the branch to +# use on cmucl master in general. +BRANCH=cmucl-expected-failures + set -x if [ -d ../ansi-test ]; then # We already have clone; make sure it's clean by stashing any - # changes. Then pull any updates. - (cd ../ansi-test; git stash; git pull --rebase) + # changes. Then pull any updates for the desired branch. + (cd ../ansi-test; git stash; git checkout $BRANCH; git pull --rebase) else (cd ../; git clone https://gitlab.common-lisp.net/cmucl/ansi-test.git) fi

cd ../ansi-test -# Use branch cmucl-expected-failures in general since this branch -# generally has the list of expected failures. This is the branch to -# use on cmucl master in general. -git checkout cmucl-expected-failures +git checkout $BRANCH

make LISP="$LISP batch -noinit -nositeinit" # There should be no unexpected successes or failures; check these separately

View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/27115bdc8e61349aaa447f11...