mirror of
https://github.com/systemd/systemd.git
synced 2024-12-23 21:35:11 +03:00
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: 514793658c
This commit is contained in:
parent
da2076a159
commit
a3e42c468f
@ -6,11 +6,7 @@ setup:
|
|||||||
- sudo apt-get build-dep -y systemd
|
- sudo apt-get build-dep -y systemd
|
||||||
- sudo apt-get install -y python3-pip
|
- sudo apt-get install -y python3-pip
|
||||||
- sudo apt-get install -y libfdisk-dev libp11-kit-dev libssl-dev
|
- 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
|
- pip3 install meson ninja
|
||||||
# python 3.5
|
|
||||||
# # See: https://github.com/mesonbuild/meson/issues/6427
|
|
||||||
#
|
|
||||||
- pip3 install meson==0.52.1 ninja
|
|
||||||
- export PATH="$HOME/.local/bin/:$PATH"
|
- 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
|
- 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
|
- ninja -v -C ./build fuzzers
|
||||||
|
@ -32,10 +32,6 @@ if [ -z "$FUZZING_ENGINE" ]; then
|
|||||||
fuzzflag="llvm-fuzz=true"
|
fuzzflag="llvm-fuzz=true"
|
||||||
fi
|
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
|
meson $build -D$fuzzflag -Db_lundef=false
|
||||||
ninja -v -C $build fuzzers
|
ninja -v -C $build fuzzers
|
||||||
|
|
||||||
|
@ -12,9 +12,7 @@ sudo apt-get build-dep systemd -y
|
|||||||
sudo apt-get install -y ninja-build python3-pip python3-setuptools quota
|
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
|
# 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
|
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
|
pip3 install meson
|
||||||
# See: https://github.com/mesonbuild/meson/issues/6427
|
|
||||||
pip3 install meson==0.52.1
|
|
||||||
|
|
||||||
cd $REPO_ROOT
|
cd $REPO_ROOT
|
||||||
export PATH="$HOME/.local/bin/:$PATH"
|
export PATH="$HOME/.local/bin/:$PATH"
|
||||||
|
@ -16,9 +16,7 @@ sudo apt-get build-dep systemd -y
|
|||||||
sudo apt-get install -y ninja-build python3-pip python3-setuptools
|
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
|
# 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
|
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
|
pip3 install meson
|
||||||
# See: https://github.com/mesonbuild/meson/issues/6427
|
|
||||||
pip3 install meson==0.52.1
|
|
||||||
|
|
||||||
cd $REPO_ROOT
|
cd $REPO_ROOT
|
||||||
export PATH="$HOME/.local/bin/:$PATH"
|
export PATH="$HOME/.local/bin/:$PATH"
|
||||||
|
Loading…
Reference in New Issue
Block a user