From a49a48122948ed0f237d5bd929ac055d23229a9a Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Tue, 24 Sep 2019 22:50:13 +0000 Subject: [PATCH] Pull llvm-devel-cmake tests from tests/llvm --- tests/llvm-devel-cmake/CMakeLists.txt | 3 --- tests/llvm-devel-cmake/runtest.sh | 16 ---------------- tests/testsllvm-devel.yml | 5 ++++- 3 files changed, 4 insertions(+), 20 deletions(-) delete mode 100644 tests/llvm-devel-cmake/CMakeLists.txt delete mode 100755 tests/llvm-devel-cmake/runtest.sh diff --git a/tests/llvm-devel-cmake/CMakeLists.txt b/tests/llvm-devel-cmake/CMakeLists.txt deleted file mode 100644 index e08cd3a..0000000 --- a/tests/llvm-devel-cmake/CMakeLists.txt +++ /dev/null @@ -1,3 +0,0 @@ -cmake_minimum_required(VERSION 3.4.3) - -find_package(LLVM) diff --git a/tests/llvm-devel-cmake/runtest.sh b/tests/llvm-devel-cmake/runtest.sh deleted file mode 100755 index 42d42d3..0000000 --- a/tests/llvm-devel-cmake/runtest.sh +++ /dev/null @@ -1,16 +0,0 @@ -set -ex - -# This test is meant to ensure that the cmake files in llvm-devel work -# when only the packages it depends on are installed. - -ARCH=`rpm --eval '%_arch'` - -llvm_devel_num_deps=`dnf repoquery --nvr --requires --resolve llvm-devel.$ARCH | grep '^llvm' | wc -l` - -llvm_num_sub_packages_installed=`dnf list installed | grep '^llvm' | wc -l` - -# Verify that only llvm-devel dependencies are installed. -test `expr $llvm_devel_num_deps + 1` -eq $llvm_num_sub_packages_installed - -# Verify that cmake files can me used without errors. -cmake -G Ninja . diff --git a/tests/testsllvm-devel.yml b/tests/testsllvm-devel.yml index 3109a8e..bb2bd1c 100644 --- a/tests/testsllvm-devel.yml +++ b/tests/testsllvm-devel.yml @@ -24,5 +24,8 @@ - ninja-build - gcc - gcc-c++ + repositories: + - repo: "https://src.fedoraproject.org/tests/llvm.git" + dest: "llvm" tests: - - llvm-devel-cmake + - llvm/llvm-devel-cmake