From 7bb262d21a666372d90bbb41757073b39d2a1cf8 Mon Sep 17 00:00:00 2001 From: Andrew Noyes Date: Sun, 9 Jun 2019 15:20:56 -0700 Subject: [PATCH] Install build tools before running fdb_c_app test --- build/cmake/package_tester/modules/deb.sh | 4 ++++ build/cmake/package_tester/modules/rpm.sh | 4 ++++ build/cmake/package_tester/modules/tests.sh | 1 + 3 files changed, 9 insertions(+) diff --git a/build/cmake/package_tester/modules/deb.sh b/build/cmake/package_tester/modules/deb.sh index 575a2388de..fcef96805a 100644 --- a/build/cmake/package_tester/modules/deb.sh +++ b/build/cmake/package_tester/modules/deb.sh @@ -6,6 +6,10 @@ then source ${source_dir}/modules/util.sh + install_build_tools() { + apt-get -y install cmake gcc + } + install() { local __res=0 enterfun diff --git a/build/cmake/package_tester/modules/rpm.sh b/build/cmake/package_tester/modules/rpm.sh index bd3348d102..866bde558e 100644 --- a/build/cmake/package_tester/modules/rpm.sh +++ b/build/cmake/package_tester/modules/rpm.sh @@ -8,6 +8,10 @@ then conf_save_extension=".rpmsave" + install_build_tools() { + yum -y install cmake gcc + } + install() { local __res=0 enterfun diff --git a/build/cmake/package_tester/modules/tests.sh b/build/cmake/package_tester/modules/tests.sh index dbef5cf423..5dd39b21e0 100644 --- a/build/cmake/package_tester/modules/tests.sh +++ b/build/cmake/package_tester/modules/tests.sh @@ -69,6 +69,7 @@ then successOr "Loading python bindings failed" # Test cmake and pkg-config integration: https://github.com/apple/foundationdb/issues/1483 + install_build_tools rm -rf build-fdb_c_app mkdir build-fdb_c_app pushd build-fdb_c_app