diff options
| author | Frantisek Sumsal <frantisek@sumsal.cz> | 2021-06-24 12:13:52 +0200 |
|---|---|---|
| committer | Luca Boccassi <luca.boccassi@gmail.com> | 2021-06-24 17:26:19 +0200 |
| commit | eb70d9450c485bcf744d3aa780f1aa6737778df5 (patch) | |
| tree | 23d327aee10be359c4f5f0fe992f608d206ee965 /test/TEST-01-BASIC/test.sh | |
| parent | Merge pull request #20001 from keszybz/test-path-simplify-less (diff) | |
| download | systemd-eb70d9450c485bcf744d3aa780f1aa6737778df5.tar.xz systemd-eb70d9450c485bcf744d3aa780f1aa6737778df5.zip | |
test: correctly mask supporting services in tests, take #2
Due to a little misunderstanding the last patch doesn't work as
expected, since test_create_image() is called only for the first image
(usually TEST-01-BASIC), and all subsequent images are then (possibly)
modified with test_append_files().
Follow-up to 179ca4d2b1b5579014773a128462475f99b7a91b.
Diffstat (limited to 'test/TEST-01-BASIC/test.sh')
| -rwxr-xr-x | test/TEST-01-BASIC/test.sh | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/test/TEST-01-BASIC/test.sh b/test/TEST-01-BASIC/test.sh index 5a6156d770..d42c0df9a0 100755 --- a/test/TEST-01-BASIC/test.sh +++ b/test/TEST-01-BASIC/test.sh @@ -9,18 +9,6 @@ TEST_REQUIRE_INSTALL_TESTS=0 # shellcheck source=test/test-functions . "${TEST_BASE_DIR:?}/test-functions" -# Explicitly override the default test_create_image() function to avoid the -# call to mask_supporting_services(), since we want to run them in TEST-01-BASIC -test_create_image() { - create_empty_image_rootdir - - # Create what will eventually be our root filesystem onto an overlay - ( - LOG_LEVEL=5 - setup_basic_environment - ) -} - test_append_files() { # install tests manually so the test is functional even when -Dinstall-tests=false local dst="${1:?}/usr/lib/systemd/tests/testdata/units/" |