h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-04-25 04:11:14 -03:00
Code Issues Packages Projects Releases Wiki Activity
Files
344ff7be88ece267f3ced442d4e122fb77e8fcef
fish-shell/docker/context/fish_run_tests.sh

39 lines
736 B
Bash
Raw Normal View History

Clean up shell scripts Some changes fix actual problems, e.g. missing spaces in square bracket tests, and backticks unintentionally causing code execution when intended as formatting. Others, such as conservative quoting probably work fine in the old version in most situations, but it's nice to have some additional safety. Using `{ ..; }` instead of `(..)` is just a small performance enhancement. Many of these issues were identified by shellcheck, which might be useful in CI as well.
2025-04-24 00:38:30 +02:00
#!/bin/sh
set -e
Introduce Docker-based build and test environments This is the start of an effort to make it easier to build and run tests in various Linux environments. The idea is to reduce our reliance on CI and also allow an easy to way capture tricky environments like musl or gcc 5. This adds two initial Dockerfiles corresponding to Ubuntu Bionic, and Ubuntu Bionic with Thread Sanitizer enabled. It also adds a new script `docker/docker_run_tests.sh`. An example of usage: docker/docker_run_tests.sh docker/bionic-tsan.Dockerfile When run, this builds a Docker image (which is cached after the first build) and sets its entry point to a new script `fish_run_tests.sh`. It then launches a container with that image, with a directory `/fish-source` bound to the fish-shell source directory on the host. Note it is a bind mount, not a copy, so changes to host files are instantly visible inside the container. It then configures with CMake and runs the tests. The Docker user is `fishuser` with password `fish`. The script also supports two arguments `--shell-before` and `--shell-after`. These drop the user into a bash shell before (or after) the tests are run, to aid in debugging. Note there's no automation for invoking this script yet; it must be run manually. But it runs on both Mac and Linux!
2020-11-21 13:55:15 -08:00
# This script is copied into the root directory of our Docker tests.
# It is the entry point for running Docker-based tests.
docker/fish_run_tests.sh: add check command to bash history Closes #11600
2025-06-23 09:59:49 +02:00
echo build_tools/check.sh >>~/.bash_history
docker_run_tests.sh: stop using cmake Use test_driver directly instead of CMake in the docker tests. Deal with the read-only "/fish-source" by exporting "CARGO_TARGET_DIR=$HOME/fish-build". It seems correct to also inject this environment variable into the interactive debugging shells. Add some logging to make this override more obvious to the user. Adopt "build_tools/check.sh", because that defines the full set of checks that we (eventually) want to run in CI. In particular, this will also run "tests/checks/po-files-up-to-date.fish" which "cargo b && cargo t && tests/test_driver.py" does not, due to the REQUIRES clause. Since most docker images have some lints/warnings today, disable those for now. Use "docker_run_tests.sh --lint" to override. The default may be changed in future.
2025-06-19 12:00:43 +02:00
cd /fish-source
Fix test_version.fish for Ubuntu Noble Numbat Docker build git_version_gen fails on Noble Numbat because modern Git refuses to read repo-local config if owned by another user. fishuser@a4263f53c93e:~/fish-build$ cd /fish-source/ fishuser@a4263f53c93e:/fish-source$ git describe --always --dirty fatal: detected dubious ownership in repository at '/fish-source' To add an exception for this directory, call: Allow reading it (though that doesn't seem necessary here, it would be better to ignore it).
2024-04-28 10:27:29 +02:00
git config --global --add safe.directory /fish-source
docker_run_tests.sh: stop using cmake Use test_driver directly instead of CMake in the docker tests. Deal with the read-only "/fish-source" by exporting "CARGO_TARGET_DIR=$HOME/fish-build". It seems correct to also inject this environment variable into the interactive debugging shells. Add some logging to make this override more obvious to the user. Adopt "build_tools/check.sh", because that defines the full set of checks that we (eventually) want to run in CI. In particular, this will also run "tests/checks/po-files-up-to-date.fish" which "cargo b && cargo t && tests/test_driver.py" does not, due to the REQUIRES clause. Since most docker images have some lints/warnings today, disable those for now. Use "docker_run_tests.sh --lint" to override. The default may be changed in future.
2025-06-19 12:00:43 +02:00
export CARGO_TARGET_DIR="$HOME"/fish-build
interactive_shell() {
echo
echo "+ export=CARGO_TARGET_DIR=$CARGO_TARGET_DIR"
echo
bash -i
}
Introduce Docker-based build and test environments This is the start of an effort to make it easier to build and run tests in various Linux environments. The idea is to reduce our reliance on CI and also allow an easy to way capture tricky environments like musl or gcc 5. This adds two initial Dockerfiles corresponding to Ubuntu Bionic, and Ubuntu Bionic with Thread Sanitizer enabled. It also adds a new script `docker/docker_run_tests.sh`. An example of usage: docker/docker_run_tests.sh docker/bionic-tsan.Dockerfile When run, this builds a Docker image (which is cached after the first build) and sets its entry point to a new script `fish_run_tests.sh`. It then launches a container with that image, with a directory `/fish-source` bound to the fish-shell source directory on the host. Note it is a bind mount, not a copy, so changes to host files are instantly visible inside the container. It then configures with CMake and runs the tests. The Docker user is `fishuser` with password `fish`. The script also supports two arguments `--shell-before` and `--shell-after`. These drop the user into a bash shell before (or after) the tests are run, to aid in debugging. Note there's no automation for invoking this script yet; it must be run manually. But it runs on both Mac and Linux!
2020-11-21 13:55:15 -08:00
# Spawn a shell if FISH_RUN_SHELL_BEFORE_TESTS is set.
if test -n "$FISH_RUN_SHELL_BEFORE_TESTS"
then
docker_run_tests.sh: stop using cmake Use test_driver directly instead of CMake in the docker tests. Deal with the read-only "/fish-source" by exporting "CARGO_TARGET_DIR=$HOME/fish-build". It seems correct to also inject this environment variable into the interactive debugging shells. Add some logging to make this override more obvious to the user. Adopt "build_tools/check.sh", because that defines the full set of checks that we (eventually) want to run in CI. In particular, this will also run "tests/checks/po-files-up-to-date.fish" which "cargo b && cargo t && tests/test_driver.py" does not, due to the REQUIRES clause. Since most docker images have some lints/warnings today, disable those for now. Use "docker_run_tests.sh --lint" to override. The default may be changed in future.
2025-06-19 12:00:43 +02:00
interactive_shell
Introduce Docker-based build and test environments This is the start of an effort to make it easier to build and run tests in various Linux environments. The idea is to reduce our reliance on CI and also allow an easy to way capture tricky environments like musl or gcc 5. This adds two initial Dockerfiles corresponding to Ubuntu Bionic, and Ubuntu Bionic with Thread Sanitizer enabled. It also adds a new script `docker/docker_run_tests.sh`. An example of usage: docker/docker_run_tests.sh docker/bionic-tsan.Dockerfile When run, this builds a Docker image (which is cached after the first build) and sets its entry point to a new script `fish_run_tests.sh`. It then launches a container with that image, with a directory `/fish-source` bound to the fish-shell source directory on the host. Note it is a bind mount, not a copy, so changes to host files are instantly visible inside the container. It then configures with CMake and runs the tests. The Docker user is `fishuser` with password `fish`. The script also supports two arguments `--shell-before` and `--shell-after`. These drop the user into a bash shell before (or after) the tests are run, to aid in debugging. Note there's no automation for invoking this script yet; it must be run manually. But it runs on both Mac and Linux!
2020-11-21 13:55:15 -08:00
fi
docker_run_tests: fix failed build exiting prematurely My bad; the "set +e" is only active inside the subshell. The outer shell uses "set -e", which means that it will exit upon seeing the subshell fail.
2025-06-19 13:36:33 +02:00
set +e
docker_run_tests.sh: stop using cmake Use test_driver directly instead of CMake in the docker tests. Deal with the read-only "/fish-source" by exporting "CARGO_TARGET_DIR=$HOME/fish-build". It seems correct to also inject this environment variable into the interactive debugging shells. Add some logging to make this override more obvious to the user. Adopt "build_tools/check.sh", because that defines the full set of checks that we (eventually) want to run in CI. In particular, this will also run "tests/checks/po-files-up-to-date.fish" which "cargo b && cargo t && tests/test_driver.py" does not, due to the REQUIRES clause. Since most docker images have some lints/warnings today, disable those for now. Use "docker_run_tests.sh --lint" to override. The default may be changed in future.
2025-06-19 12:00:43 +02:00
build_tools/check.sh
Correct exit status of fish_run_tests.sh fish_run_tests.sh was failing because its final command was a variable test which was usually false. Switch to an if statement so the result is true.
2022-10-23 10:13:52 -07:00
RES=$?
docker_run_tests: fix failed build exiting prematurely My bad; the "set +e" is only active inside the subshell. The outer shell uses "set -e", which means that it will exit upon seeing the subshell fail.
2025-06-19 13:36:33 +02:00
set -e
Introduce Docker-based build and test environments This is the start of an effort to make it easier to build and run tests in various Linux environments. The idea is to reduce our reliance on CI and also allow an easy to way capture tricky environments like musl or gcc 5. This adds two initial Dockerfiles corresponding to Ubuntu Bionic, and Ubuntu Bionic with Thread Sanitizer enabled. It also adds a new script `docker/docker_run_tests.sh`. An example of usage: docker/docker_run_tests.sh docker/bionic-tsan.Dockerfile When run, this builds a Docker image (which is cached after the first build) and sets its entry point to a new script `fish_run_tests.sh`. It then launches a container with that image, with a directory `/fish-source` bound to the fish-shell source directory on the host. Note it is a bind mount, not a copy, so changes to host files are instantly visible inside the container. It then configures with CMake and runs the tests. The Docker user is `fishuser` with password `fish`. The script also supports two arguments `--shell-before` and `--shell-after`. These drop the user into a bash shell before (or after) the tests are run, to aid in debugging. Note there's no automation for invoking this script yet; it must be run manually. But it runs on both Mac and Linux!
2020-11-21 13:55:15 -08:00
# Drop the user into a shell if FISH_RUN_SHELL_AFTER_TESTS is set.
Correct exit status of fish_run_tests.sh fish_run_tests.sh was failing because its final command was a variable test which was usually false. Switch to an if statement so the result is true.
2022-10-23 10:13:52 -07:00
if test -n "$FISH_RUN_SHELL_AFTER_TESTS"; then
docker_run_tests.sh: stop using cmake Use test_driver directly instead of CMake in the docker tests. Deal with the read-only "/fish-source" by exporting "CARGO_TARGET_DIR=$HOME/fish-build". It seems correct to also inject this environment variable into the interactive debugging shells. Add some logging to make this override more obvious to the user. Adopt "build_tools/check.sh", because that defines the full set of checks that we (eventually) want to run in CI. In particular, this will also run "tests/checks/po-files-up-to-date.fish" which "cargo b && cargo t && tests/test_driver.py" does not, due to the REQUIRES clause. Since most docker images have some lints/warnings today, disable those for now. Use "docker_run_tests.sh --lint" to override. The default may be changed in future.
2025-06-19 12:00:43 +02:00
interactive_shell
Correct exit status of fish_run_tests.sh fish_run_tests.sh was failing because its final command was a variable test which was usually false. Switch to an if statement so the result is true.
2022-10-23 10:13:52 -07:00
fi
exit $RES
Reference in New Issue Copy Permalink