diff options
| author | Tom Rini <trini@konsulko.com> | 2023-10-20 13:15:10 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-10-20 13:15:10 -0400 |
| commit | 4b0359951113c86f9e9c02d7c29718c0bfa4f1a2 (patch) | |
| tree | 6ba5bf11278e1065fd785ee4355501541a9f45c1 | |
| parent | 0aaaa17a19c5106e564d562333ac701c81209b8e (diff) | |
| download | u-boot-TEST/v4.1-tidy-up-use-of-CONFIG_CMDLINE.zip u-boot-TEST/v4.1-tidy-up-use-of-CONFIG_CMDLINE.tar.gz u-boot-TEST/v4.1-tidy-up-use-of-CONFIG_CMDLINE.tar.bz2 | |
CI, pytest: Add a test for sandbox without LTOTEST/v4.1-tidy-up-use-of-CONFIG_CMDLINE
The primary motivation for having a sandbox without LTO build in CI is
to ensure that we don't have that option break. We now have the ability
to run tests of specific options being enabled/disabled, so drop the
parts of CI that build and test that configuration specifically and add
a build test instead. We still test that "NO_LTO=1" rather than editing
the config file works via the ftrace tests.
Signed-off-by: Tom Rini <trini@konsulko.com>
---
This creates a small bisectability gap in CI itself, but I think is more
reasonable than reworking the introduction of
test/py/tests/test_sandbox_opts.py
Cc: Simon Glass <sjg@chromium.org>
| -rw-r--r-- | .azure-pipelines.yml | 3 | ||||
| -rw-r--r-- | .gitlab-ci.yml | 12 | ||||
| -rw-r--r-- | test/py/tests/test_sandbox_opts.py | 10 |
3 files changed, 10 insertions, 15 deletions
diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 6f91553..65533b3 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -287,9 +287,6 @@ stages: sandbox64_clang: TEST_PY_BD: "sandbox64" OVERRIDE: "-O clang-16" - sandbox_nolto: - TEST_PY_BD: "sandbox" - BUILD_ENV: "NO_LTO=1" sandbox_spl: TEST_PY_BD: "sandbox_spl" TEST_PY_TEST_SPEC: "test_ofplatdata or test_handoff or test_spl" diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6decdfd..97c964f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -258,12 +258,6 @@ sandbox with clang test.py: OVERRIDE: "-O clang-16" <<: *buildman_and_testpy_dfn -sandbox without LTO test.py: - variables: - TEST_PY_BD: "sandbox" - BUILD_ENV: "NO_LTO=1" - <<: *buildman_and_testpy_dfn - sandbox64 test.py: variables: TEST_PY_BD: "sandbox64" @@ -275,12 +269,6 @@ sandbox64 with clang test.py: OVERRIDE: "-O clang-16" <<: *buildman_and_testpy_dfn -sandbox64 without LTO test.py: - variables: - TEST_PY_BD: "sandbox64" - BUILD_ENV: "NO_LTO=1" - <<: *buildman_and_testpy_dfn - sandbox_spl test.py: variables: TEST_PY_BD: "sandbox_spl" diff --git a/test/py/tests/test_sandbox_opts.py b/test/py/tests/test_sandbox_opts.py index 91790b3..422b43c 100644 --- a/test/py/tests/test_sandbox_opts.py +++ b/test/py/tests/test_sandbox_opts.py @@ -18,3 +18,13 @@ def test_sandbox_cmdline(u_boot_console): out = util.run_and_log( cons, ['./tools/buildman/buildman', '-m', '--board', 'sandbox', '-a', '~CMDLINE', '-o', TMPDIR]) + +@pytest.mark.slow +@pytest.mark.boardspec('sandbox') +def test_sandbox_lto(u_boot_console): + """Test building sandbox without CONFIG_LTO""" + cons = u_boot_console + + out = util.run_and_log( + cons, ['./tools/buildman/buildman', '-m', '--board', 'sandbox', + '-a', '~LTO', '-o', TMPDIR]) |