From a3e42c468fc18e6713622b7e4af5d45c5887e54c Mon Sep 17 00:00:00 2001
From: Frantisek Sumsal <frantisek@sumsal.cz>
Date: Sat, 25 Jan 2020 17:48:23 +0100
Subject: [PATCH] test: unpin meson from v0.52.1
The compatibility issue in meson v0.53 has been fixed in v0.53.1, which
is already available through pip, so let's remove the pin for meson
introduced before.
Reverts: 514793658c499821383bdc8bbf1d33048c18dd40
---
fuzzbuzz.yaml | 6 +-----
tools/oss-fuzz.sh | 4 ----
travis-ci/managers/fuzzbuzz.sh | 4 +---
travis-ci/managers/fuzzit.sh | 4 +---
4 files changed, 3 insertions(+), 15 deletions(-)
diff --git a/fuzzbuzz.yaml b/fuzzbuzz.yaml
index 6dfdd81237..5d61e4725d 100644
--- a/fuzzbuzz.yaml
+++ b/fuzzbuzz.yaml
@@ -6,11 +6,7 @@ setup:
- sudo apt-get build-dep -y systemd
- sudo apt-get install -y python3-pip
- sudo apt-get install -y libfdisk-dev libp11-kit-dev libssl-dev
-# FIXME: temporarily pin the meson version as 0.53 doesn't work with older
-# python 3.5
-# # See: https://github.com/mesonbuild/meson/issues/6427
-#
-- pip3 install meson==0.52.1 ninja
+- pip3 install meson ninja
- export PATH="$HOME/.local/bin/:$PATH"
- CC=$FUZZ_CC CXX=$FUZZ_CXX meson -Dfuzzbuzz=true -Dfuzzbuzz-engine-dir=$(dirname "$FUZZ_ENGINE") -Dfuzzbuzz-engine=$(cut -d. -f1 <(basename "$FUZZ_ENGINE")) -Db_lundef=false ./build
- ninja -v -C ./build fuzzers
diff --git a/tools/oss-fuzz.sh b/tools/oss-fuzz.sh
index 6884048d83..5e48a7e0c6 100755
--- a/tools/oss-fuzz.sh
+++ b/tools/oss-fuzz.sh
@@ -32,10 +32,6 @@ if [ -z "$FUZZING_ENGINE" ]; then
fuzzflag="llvm-fuzz=true"
fi
-# FIXME: temporarily pin the meson version as 0.53 doesn't work with older python 3.5
-# See: https://github.com/mesonbuild/meson/issues/6427
-pip3 install meson==0.52.1
-
meson $build -D$fuzzflag -Db_lundef=false
ninja -v -C $build fuzzers
diff --git a/travis-ci/managers/fuzzbuzz.sh b/travis-ci/managers/fuzzbuzz.sh
index 21b736cb60..d6768f1de9 100755
--- a/travis-ci/managers/fuzzbuzz.sh
+++ b/travis-ci/managers/fuzzbuzz.sh
@@ -12,9 +12,7 @@ sudo apt-get build-dep systemd -y
sudo apt-get install -y ninja-build python3-pip python3-setuptools quota
# The following should be dropped when debian packaging has been updated to include them
sudo apt-get install -y libfdisk-dev libp11-kit-dev libssl-dev
-# FIXME: temporarily pin the meson version as 0.53 doesn't work with older python 3.5
-# See: https://github.com/mesonbuild/meson/issues/6427
-pip3 install meson==0.52.1
+pip3 install meson
cd $REPO_ROOT
export PATH="$HOME/.local/bin/:$PATH"
diff --git a/travis-ci/managers/fuzzit.sh b/travis-ci/managers/fuzzit.sh
index 044d126e15..d442942d4a 100755
--- a/travis-ci/managers/fuzzit.sh
+++ b/travis-ci/managers/fuzzit.sh
@@ -16,9 +16,7 @@ sudo apt-get build-dep systemd -y
sudo apt-get install -y ninja-build python3-pip python3-setuptools
# The following should be dropped when debian packaging has been updated to include them
sudo apt-get install -y libfdisk-dev libp11-kit-dev libssl-dev
-# FIXME: temporarily pin the meson version as 0.53 doesn't work with older python 3.5
-# See: https://github.com/mesonbuild/meson/issues/6427
-pip3 install meson==0.52.1
+pip3 install meson
cd $REPO_ROOT
export PATH="$HOME/.local/bin/:$PATH"