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

diff --git a/fuzzbuzz.yaml b/fuzzbuzz.yaml
index 6dfdd8123722060c8bba3045e9a36cdac8c29638..5d61e4725ddfd402d7795553dee874eb8f63dd18 100644 (file)
--- 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 6884048d83e28a5703749ce9510220113e9f351a..5e48a7e0c69b03ef566b9742401d7c54c31dd83f 100755 (executable)
--- 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 21b736cb6041cf26793ed52782830aa95050d566..d6768f1de9dc8adace8671373733bdac9c83c8c5 100755 (executable)
--- 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 044d126e150c525a459d3107d18a56685c51e7a5..d442942d4ac2d8dae9052eb8d4b4530d87f9894f 100755 (executable)
--- 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"