From fd103ed417e4f54f12f3bfceb223da13a722cfe7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Valverde?= Date: Thu, 30 Aug 2018 22:33:52 +0100 Subject: [PATCH] vagrant: Enable ccache Change-Id: Ifcf24a7ad2a1745f67838ee76a8a49e51049fc3a Reviewed-on: https://code.wireshark.org/review/29359 Reviewed-by: Anders Broman --- Vagrantfile | 2 ++ vagrant_build.sh | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Vagrantfile b/Vagrantfile index 2f38d0e192..58c4f6e1dc 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -23,6 +23,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| s.path = 'tools/debian-setup.sh' s.args = ['--install-optional', '--assume-yes'] end + deb.vm.provision :shell, inline: "apt-get -y install ccache" deb.vm.provision :shell, path: 'vagrant_build.sh', privileged: false end @@ -33,6 +34,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| s.path = 'tools/rpm-setup.sh' s.args = ['--install-optional', '--assumeyes'] end + rpm.vm.provision :shell, inline: "yum -y install ccache" rpm.vm.provision :shell, path: 'vagrant_build.sh', privileged: false end end diff --git a/vagrant_build.sh b/vagrant_build.sh index b7c67a4bd8..72cd19e658 100644 --- a/vagrant_build.sh +++ b/vagrant_build.sh @@ -14,6 +14,6 @@ grep -q WIRESHARK_RUN_FROM_BUILD_DIRECTORY ~/.profile || echo "export WIRESHARK_ grep -q WIRESHARK_BIN_DIR ~/.profile || echo "export WIRESHARK_BIN_DIR=~/build/run" >> ~/.profile mkdir -p build cd build -cmake /vagrant/ +cmake -DENABLE_CCACHE=ON /vagrant/ make -j6 make test