From c115c4653f96e6e802bcd3b0223a9f41cb979a08 Mon Sep 17 00:00:00 2001 From: Jesus Checa Hidalgo Date: Mon, 12 Sep 2022 16:19:03 +0200 Subject: [PATCH] Migrate tests to tests/python-lit repo --- tests/README.md | 6 ++++++ tests/build-gating.fmf | 6 ++++-- tests/sanity/main.fmf | 16 ---------------- tests/sanity/test.sh | 3 --- 4 files changed, 10 insertions(+), 21 deletions(-) create mode 100644 tests/README.md delete mode 100644 tests/sanity/main.fmf delete mode 100755 tests/sanity/test.sh diff --git a/tests/README.md b/tests/README.md new file mode 100644 index 0000000..706cd50 --- /dev/null +++ b/tests/README.md @@ -0,0 +1,6 @@ +# Gating testplans for python-lit + +The tests for python-lit are in a separate repo: https://src.fedoraproject.org/tests/python-lit +This directory should contain only fmf plans (such as build-gating.fmf) which import +the tests from the tests repo. This can be done using the "url" parameter of the +plan's "discover" step. Reference: https://tmt.readthedocs.io/en/stable/spec/plans.html#fmf \ No newline at end of file diff --git a/tests/build-gating.fmf b/tests/build-gating.fmf index 067d00d..82541f8 100644 --- a/tests/build-gating.fmf +++ b/tests/build-gating.fmf @@ -59,10 +59,12 @@ adjust: discover: - name: python-lit-tests how: fmf + url: https://src.fedoraproject.org/tests/python-lit.git + ref: main - name: upstream-llvm-integration-testsuite how: fmf - url: https://src.fedoraproject.org/rpms/llvm.git - ref: rawhide + url: https://src.fedoraproject.org/tests/llvm.git + ref: main test: integration-test-suite execute: how: tmt diff --git a/tests/sanity/main.fmf b/tests/sanity/main.fmf deleted file mode 100644 index 0a488fa..0000000 --- a/tests/sanity/main.fmf +++ /dev/null @@ -1,16 +0,0 @@ -summary: Trivial sanity test -test: "$WITH_SCL ./test.sh" -require: [] -adjust: - # Common requirements when LLVM is not SCL-ized - - require+: - - python3-lit - when: "collection is not defined" - - # Requirements for SCL-ized LLVM - - require+: - - llvm-toolset-13.0-python3-lit - when: "collection == llvm-toolset-13.0" - - require+: - - llvm-toolset-14.0-python3-lit - when: "collection == llvm-toolset-14.0" diff --git a/tests/sanity/test.sh b/tests/sanity/test.sh deleted file mode 100755 index a8aad72..0000000 --- a/tests/sanity/test.sh +++ /dev/null @@ -1,3 +0,0 @@ -#! /bin/sh -eux - -lit --version